diff --git a/runner/src/redis-client/index.ts b/runner/src/redis-client/index.ts
new file mode 100644
index 000000000..efa0f96e7
--- /dev/null
+++ b/runner/src/redis-client/index.ts
@@ -0,0 +1 @@
+export { default } from './redis-client';
diff --git a/runner/src/redis-client/redis-client.test.ts b/runner/src/redis-client/redis-client.test.ts
new file mode 100644
index 000000000..e09925e52
--- /dev/null
+++ b/runner/src/redis-client/redis-client.test.ts
@@ -0,0 +1,114 @@
+import RedisClient from './redis-client';
+
+describe('RedisClient', () => {
+  describe('getNextStreamMessage', () => {
+    it('returns the first message when none processed', async () => {
+      const mockClient = {
+        on: jest.fn(),
+        connect: jest.fn().mockResolvedValue(null),
+        get: jest.fn().mockResolvedValue(null),
+        xRead: jest.fn().mockResolvedValue(null),
+      } as any;
+
+      const client = new RedisClient(mockClient);
+
+      const message = await client.getNextStreamMessage('streamKey');
+
+      expect(mockClient.get).toHaveBeenCalledWith('streamKey:lastId');
+      expect(mockClient.xRead).toHaveBeenCalledWith(
+        { key: 'streamKey', id: '0' },
+        { COUNT: 1 }
+      );
+      expect(message).toBeUndefined();
+    });
+
+    it('returns the message after the last processed', async () => {
+      const mockClient = {
+        on: jest.fn(),
+        connect: jest.fn().mockResolvedValue(null),
+        get: jest.fn().mockResolvedValue('0-0'),
+        xRead: jest.fn().mockResolvedValue([
+          {
+            messages: ['data']
+          }
+        ]),
+      } as any;
+
+      const client = new RedisClient(mockClient);
+
+      const message = await client.getNextStreamMessage('streamKey');
+
+      expect(mockClient.get).toHaveBeenCalledWith('streamKey:lastId');
+      expect(mockClient.xRead).toHaveBeenCalledWith(
+        { key: 'streamKey', id: '0-0' },
+        { COUNT: 1 }
+      );
+      expect(message).toStrictEqual(['data']);
+    });
+  });
+
+  it('acknowledges the stream message', async () => {
+    const mockClient = {
+      on: jest.fn(),
+      connect: jest.fn().mockResolvedValue(null),
+      set: jest.fn().mockResolvedValue(null),
+    } as any;
+
+    const client = new RedisClient(mockClient);
+
+    await client.acknowledgeStreamMessage('streamKey', '1-1');
+
+    expect(mockClient.set).toHaveBeenCalledWith('streamKey:lastId', '1-1');
+  });
+
+  it('returns the range of messages after the passed id', async () => {
+    const mockClient = {
+      on: jest.fn(),
+      connect: jest.fn().mockResolvedValue(null),
+      xRange: jest.fn().mockResolvedValue([
+        'data'
+      ]),
+      get: jest.fn().mockResolvedValue('1-0'),
+    } as any;
+
+    const client = new RedisClient(mockClient);
+
+    const unprocessedMessages = await client.getUnprocessedStreamMessages('streamKey');
+
+    expect(mockClient.get).toHaveBeenCalledWith('streamKey:lastId');
+    expect(mockClient.xRange).toHaveBeenCalledWith('streamKey', '1-1', '+');
+    expect(unprocessedMessages).toEqual([
+      'data'
+    ]);
+  });
+
+  it('returns stream storage data', async () => {
+    const mockClient = {
+      on: jest.fn(),
+      connect: jest.fn().mockResolvedValue(null),
+      get: jest.fn().mockResolvedValue(JSON.stringify({ account_id: '123', function_name: 'testFunc' })),
+    } as any;
+
+    const client = new RedisClient(mockClient);
+
+    const storageData = await client.getStreamStorage('streamKey');
+
+    expect(mockClient.get).toHaveBeenCalledWith('streamKey:storage');
+    expect(storageData).toEqual({ account_id: '123', function_name: 'testFunc' });
+  });
+
+  it('returns the list of streams', async () => {
+    const mockClient = {
+      on: jest.fn(),
+      connect: jest.fn().mockResolvedValue(null),
+      sMembers: jest.fn().mockResolvedValue(['streamKey1', 'streamKey2']),
+    } as any;
+
+    const client = new RedisClient(mockClient);
+
+    const streams = await client.getStreams();
+
+    expect(mockClient.sMembers).toHaveBeenCalledWith('streams');
+    expect(streams).toEqual(['streamKey1', 'streamKey2']);
+  });
+});
diff --git a/runner/src/redis-client.ts b/runner/src/redis-client/redis-client.ts
similarity index 100%
rename from runner/src/redis-client.ts
rename to runner/src/redis-client/redis-client.ts