diff --git a/.php_cs b/.php_cs
index afcb974..5abf409 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-use ApiClients\Tools\TestUtilities\PhpCsFixerConfig;
+use ApiClients\Tools\CsFixerConfig\PhpCsFixerConfig;
 use PhpCsFixer\Config;
 
 return (function (): Config
 {
     $paths = [
-        __DIR__ . DIRECTORY_SEPARATOR . 'src',
+        __DIR__ . DIRECTORY_SEPARATOR . 'etc',
         __DIR__ . DIRECTORY_SEPARATOR . 'tests',
     ];
 
diff --git a/.travis.yml b/.travis.yml
index c9b6bf0..11a8413 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,93 +8,37 @@ cache:
 ## Build matrix for lowest and highest possible targets
 matrix:
   include:
-    - php: 7.1
-      env:
-        - qaExtended=true
     - php: 7.2
       env:
+        - qaExtended=true
         - dropPlatform=false
-    - php: 7.3snapshot
-      env:
-        - dropPlatform=false
-      dist: xenial
-      sudo: required
-      addons:
-       apt:
-        packages:
-          - libzip4
-    - php: 7.3.0RC1
+    - php: 7.3
       env:
         - dropPlatform=false
-      dist: xenial
-      sudo: required
-      addons:
-       apt:
-        packages:
-          - libzip4
     - php: nightly
       env:
         - dropPlatform=false
-    - php: 7.1
-      env:
-        - dependencies=lowest
-        - dropPlatform=false
     - php: 7.2
       env:
         - dependencies=lowest
         - dropPlatform=false
-    - php: 7.3snapshot
-      env:
-        - dependencies=lowest
-        - dropPlatform=false
-      dist: xenial
-      sudo: required
-      addons:
-       apt:
-        packages:
-          - libzip4
-    - php: 7.3.0RC1
+    - php: 7.3
       env:
         - dependencies=lowest
         - dropPlatform=false
-      dist: xenial
-      sudo: required
-      addons:
-       apt:
-        packages:
-          - libzip4
+
     - php: nightly
       env:
         - dependencies=lowest
         - dropPlatform=false
-    - php: 7.1
-      env:
-        - dependencies=highest
-        - dropPlatform=false
     - php: 7.2
       env:
         - dependencies=highest
         - dropPlatform=false
-    - php: 7.3snapshot
-      env:
-        - dependencies=highest
-        - dropPlatform=false
-      dist: xenial
-      sudo: required
-      addons:
-       apt:
-        packages:
-          - libzip4
-    - php: 7.3.0RC1
+    - php: 7.3
       env:
         - dependencies=highest
         - dropPlatform=false
-      dist: xenial
-      sudo: required
-      addons:
-       apt:
-        packages:
-          - libzip4
     - php: nightly
       env:
         - dependencies=highest
diff --git a/appveyor.yml b/appveyor.yml
index 63ace03..de1539b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,16 +6,10 @@ clone_folder: c:\projects\php-project-workspace
 ## Build matrix for lowest and highest possible targets
 environment:
   matrix:
-  - dependencies: lowest
-    php_ver_target: 7.1
   - dependencies: lowest
     php_ver_target: 7.2
-  - dependencies: current
-    php_ver_target: 7.1
   - dependencies: current
     php_ver_target: 7.2
-  - dependencies: highest
-    php_ver_target: 7.1
   - dependencies: highest
     php_ver_target: 7.2
 
diff --git a/composer.json b/composer.json
index f9d1c8b..553655f 100644
--- a/composer.json
+++ b/composer.json
@@ -4,12 +4,11 @@
     "description": "PHP-DI definition for clue/redis-react",
     "require": {
         "php": "^7.2",
-        "clue/redis-react": "^2.2",
-        "psr/log": "^1.0",
-        "wyrihaximus/psr-3-callable-throwable-logger": "^1.0"
+        "wyrihaximus/react-redis-waiting-client": "dev-master"
     },
     "require-dev": {
-        "api-clients/test-utilities": "^5.1"
+        "api-clients/test-utilities": "^5.1",
+        "php-di/php-di": "^6.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
index 17a643c..80beab0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "ae73ade6e1c8ad043a31aedb9cecece0",
+    "content-hash": "80b283d128d67c68b0148d325f8e17cb",
     "packages": [
         {
             "name": "clue/redis-protocol",
@@ -147,16 +147,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
                 "shasum": ""
             },
             "require": {
@@ -190,7 +190,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2018-11-20T15:27:04+00:00"
         },
         {
             "name": "react/cache",
@@ -234,16 +234,16 @@
         },
         {
             "name": "react/dns",
-            "version": "v0.4.15",
+            "version": "v0.4.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/dns.git",
-                "reference": "319e110a436d26a2fa137cfa3ef2063951715794"
+                "reference": "0a0bedfec72b38406413c6ea01e1c015bd0bf72b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/dns/zipball/319e110a436d26a2fa137cfa3ef2063951715794",
-                "reference": "319e110a436d26a2fa137cfa3ef2063951715794",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/0a0bedfec72b38406413c6ea01e1c015bd0bf72b",
+                "reference": "0a0bedfec72b38406413c6ea01e1c015bd0bf72b",
                 "shasum": ""
             },
             "require": {
@@ -275,7 +275,7 @@
                 "dns-resolver",
                 "reactphp"
             ],
-            "time": "2018-07-02T12:17:56+00:00"
+            "time": "2018-11-11T11:21:13+00:00"
         },
         {
             "name": "react/event-loop",
@@ -554,6 +554,43 @@
             ],
             "description": "callable throwable decorator around a PSR-3 logger (to be used with react/promise and reactivex/rxphp)",
             "time": "2018-05-07T18:12:24+00:00"
+        },
+        {
+            "name": "wyrihaximus/react-redis-waiting-client",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/WyriHaximus/reactphp-redis-waiting-client.git",
+                "reference": "5fa16dafecca18ff4973b3a719e01b59131608cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/WyriHaximus/reactphp-redis-waiting-client/zipball/5fa16dafecca18ff4973b3a719e01b59131608cf",
+                "reference": "5fa16dafecca18ff4973b3a719e01b59131608cf",
+                "shasum": ""
+            },
+            "require": {
+                "clue/redis-react": "^2.2",
+                "php": "^7.2",
+                "psr/log": "^1.0",
+                "wyrihaximus/psr-3-callable-throwable-logger": "^1.0"
+            },
+            "require-dev": {
+                "api-clients/cs-fixer-config": "^1.1",
+                "api-clients/test-utilities": "^5.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "WyriHaximus\\React\\Redis\\WaitingClient\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Waiting client around clue/redis-react",
+            "time": "2018-12-19T12:17:46+00:00"
         }
     ],
     "packages-dev": [
@@ -1346,6 +1383,64 @@
             "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
             "time": "2015-12-15T10:42:16+00:00"
         },
+        {
+            "name": "jeremeamia/SuperClosure",
+            "version": "2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jeremeamia/super_closure.git",
+                "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/5707d5821b30b9a07acfb4d76949784aaa0e9ce9",
+                "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^1.2|^2.0|^3.0|^4.0",
+                "php": ">=5.4",
+                "symfony/polyfill-php56": "^1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0|^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "SuperClosure\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jeremy Lindblom",
+                    "email": "jeremeamia@gmail.com",
+                    "homepage": "https://github.com/jeremeamia",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Serialize Closure objects, including their context and binding",
+            "homepage": "https://github.com/jeremeamia/super_closure",
+            "keywords": [
+                "closure",
+                "function",
+                "lambda",
+                "parser",
+                "serializable",
+                "serialize",
+                "tokenizer"
+            ],
+            "time": "2018-03-21T22:21:57+00:00"
+        },
         {
             "name": "justinrainbow/json-schema",
             "version": "5.2.7",
@@ -2033,6 +2128,149 @@
             ],
             "time": "2018-02-15T16:58:55+00:00"
         },
+        {
+            "name": "php-di/invoker",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHP-DI/Invoker.git",
+                "reference": "540c27c86f663e20fe39a24cd72fa76cdb21d41a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/540c27c86f663e20fe39a24cd72fa76cdb21d41a",
+                "reference": "540c27c86f663e20fe39a24cd72fa76cdb21d41a",
+                "shasum": ""
+            },
+            "require": {
+                "psr/container": "~1.0"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "phpunit/phpunit": "~4.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Invoker\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Generic and extensible callable invoker",
+            "homepage": "https://github.com/PHP-DI/Invoker",
+            "keywords": [
+                "callable",
+                "dependency",
+                "dependency-injection",
+                "injection",
+                "invoke",
+                "invoker"
+            ],
+            "time": "2017-03-20T19:28:22+00:00"
+        },
+        {
+            "name": "php-di/php-di",
+            "version": "6.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHP-DI/PHP-DI.git",
+                "reference": "5e8b809960d5c3bfa096a90da9a78650e80b1f0e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/5e8b809960d5c3bfa096a90da9a78650e80b1f0e",
+                "reference": "5e8b809960d5c3bfa096a90da9a78650e80b1f0e",
+                "shasum": ""
+            },
+            "require": {
+                "jeremeamia/superclosure": "^2.0",
+                "nikic/php-parser": "^2.0|^3.0|^4.0",
+                "php": ">=7.0.0",
+                "php-di/invoker": "^2.0",
+                "php-di/phpdoc-reader": "^2.0.1",
+                "psr/container": "^1.0"
+            },
+            "provide": {
+                "psr/container-implementation": "^1.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "~1.2",
+                "friendsofphp/php-cs-fixer": "^2.4",
+                "mnapoli/phpunit-easymock": "~1.0",
+                "ocramius/proxy-manager": "~2.0.2",
+                "phpstan/phpstan": "^0.9.2",
+                "phpunit/phpunit": "~6.4"
+            },
+            "suggest": {
+                "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)",
+                "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~2.0)"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DI\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "The dependency injection container for humans",
+            "homepage": "http://php-di.org/",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interop",
+                "dependency injection",
+                "di",
+                "ioc",
+                "psr11"
+            ],
+            "time": "2018-09-17T15:34:44+00:00"
+        },
+        {
+            "name": "php-di/phpdoc-reader",
+            "version": "2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHP-DI/PhpDocReader.git",
+                "reference": "7d0de60b9341933c8afd172a6255cd7557601e0e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/7d0de60b9341933c8afd172a6255cd7557601e0e",
+                "reference": "7d0de60b9341933c8afd172a6255cd7557601e0e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpDocReader\\": "src/PhpDocReader"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)",
+            "keywords": [
+                "phpdoc",
+                "reflection"
+            ],
+            "time": "2018-02-18T17:39:01+00:00"
+        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "1.0.1",
@@ -3647,6 +3885,62 @@
             ],
             "time": "2018-08-06T14:22:27+00:00"
         },
+        {
+            "name": "symfony/polyfill-php56",
+            "version": "v1.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php56.git",
+                "reference": "ff208829fe1aa48ab9af356992bb7199fed551af"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ff208829fe1aa48ab9af356992bb7199fed551af",
+                "reference": "ff208829fe1aa48ab9af356992bb7199fed551af",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/polyfill-util": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php56\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2018-09-21T06:26:08+00:00"
+        },
         {
             "name": "symfony/polyfill-php70",
             "version": "v1.9.0",
@@ -3761,6 +4055,58 @@
             ],
             "time": "2018-08-06T14:22:27+00:00"
         },
+        {
+            "name": "symfony/polyfill-util",
+            "version": "v1.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-util.git",
+                "reference": "3b58903eae668d348a7126f999b0da0f2f93611c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/3b58903eae668d348a7126f999b0da0f2f93611c",
+                "reference": "3b58903eae668d348a7126f999b0da0f2f93611c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Util\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony utilities for portability of PHP codes",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compat",
+                "compatibility",
+                "polyfill",
+                "shim"
+            ],
+            "time": "2018-09-30T16:36:12+00:00"
+        },
         {
             "name": "symfony/process",
             "version": "v4.1.6",
@@ -4011,7 +4357,9 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "wyrihaximus/react-redis-waiting-client": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
diff --git a/etc/di/redis-client.php b/etc/di/redis-client.php
index 67c50b3..239cc54 100644
--- a/etc/di/redis-client.php
+++ b/etc/di/redis-client.php
@@ -1,13 +1,15 @@
-<?php
+<?php declare(strict_types=1);
 
 use Clue\React\Redis\Client;
-use PHPDIDefinitions\Clue\Redis\Client\WaitingClient;
 use Psr\Log\LoggerInterface;
 use React\EventLoop\LoopInterface;
+use WyriHaximus\React\Redis\WaitingClient\WaitingClient;
+use function DI\factory;
+use function DI\get;
 
 return [
-    Client::class => \DI\factory(function (LoopInterface $loop, string $dsn, LoggerInterface $logger = null) {
+    Client::class => factory(function (LoopInterface $loop, string $dsn, LoggerInterface $logger = null) {
         return WaitingClient::create($loop, $dsn, $logger);
     })
-        ->parameter('dsn', \DI\get('config.redis.dsn')),
+        ->parameter('dsn', get('config.redis.dsn')),
 ];
diff --git a/src/WaitingClient.php b/src/WaitingClient.php
deleted file mode 100644
index f3ee080..0000000
--- a/src/WaitingClient.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace PHPDIDefinitions\Clue\Redis\Client;
-
-use Clue\React\Redis\Client;
-use Clue\React\Redis\Factory;
-use Evenement\EventEmitterTrait;
-use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
-use React\EventLoop\LoopInterface;
-use React\Promise\Deferred;
-use SplQueue;
-use WyriHaximus\PSR3\CallableThrowableLogger\CallableThrowableLogger;
-
-final class WaitingClient implements Client
-{
-    use EventEmitterTrait;
-
-    /**
-     * @var Client
-     */
-    private $redis;
-
-    /**
-     * @var SplQueue
-     */
-    private $callQueue;
-
-    /**
-     * @param Factory         $factory
-     * @param string          $dsn
-     * @param LoggerInterface $logger
-     *
-     * @internal
-     */
-    public function __construct(Factory $factory, string $dsn, LoggerInterface $logger)
-    {
-        $this->callQueue = new \SplQueue();
-        $logger->debug('Connecting');
-        $factory->createClient($dsn)->done(function (Client $client) use ($logger) {
-            $logger->debug('Connected');
-            $this->redis = $client;
-
-            $logger->debug('Executing ' . $this->callQueue->count() . ' waiting call(s)');
-            while ($this->callQueue->count() > 0) {
-                $call = $this->callQueue->dequeue();
-                $name = $call['name'];
-                $args = $call['args'];
-                $call['deferred']->resolve($this->redis->$name(...$args));
-            }
-            $logger->debug('Executed all waiting calls, any new calls will be send to Redis directly');
-        }, CallableThrowableLogger::create($logger));
-    }
-
-    public function __call($name, $args)
-    {
-        if ($this->redis instanceof Client) {
-            return $this->redis->$name(...$args);
-        }
-
-        $deferred = new Deferred();
-
-        $this->callQueue->enqueue([
-            'deferred' => $deferred,
-            'name' => $name,
-            'args' => $args,
-        ]);
-
-        return $deferred->promise();
-    }
-
-    public static function create(LoopInterface $loop, string $dsn, LoggerInterface $logger = null): self
-    {
-        return new self(new Factory($loop), $dsn, $logger ?? new NullLogger());
-    }
-
-    public function end()
-    {
-        // TODO: Implement end() method.
-    }
-
-    public function close()
-    {
-        // TODO: Implement close() method.
-    }
-}
diff --git a/tests/DiTest.php b/tests/DiTest.php
new file mode 100644
index 0000000..7a91cd4
--- /dev/null
+++ b/tests/DiTest.php
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace PHPDIDefinitions\Tests\Clue\Redis\Client;
+
+use ApiClients\Tools\TestUtilities\TestCase;
+use Clue\React\Redis\Client;
+use DI\Container;
+use Psr\Log\LoggerInterface;
+use React\EventLoop\LoopInterface;
+
+final class DiTest extends TestCase
+{
+    private const DSN = 'redis://::1/13';
+
+    public function testCreate()
+    {
+        $loop = $this->prophesize(LoopInterface::class);
+
+        $logger = $this->prophesize(LoggerInterface::class);
+        $logger->debug('Connecting')->shouldBeCalled();
+        $logger->debug('Connected')->shouldNotBeCalled();
+        $logger->debug('Executing 0 waiting call(s)')->shouldNotBeCalled();
+        $logger->debug('Executed all waiting calls, any new calls will be send to Redis directly')->shouldNotBeCalled();
+
+        $di = require dirname(__DIR__) . DIRECTORY_SEPARATOR . 'etc' . DIRECTORY_SEPARATOR . 'di' . DIRECTORY_SEPARATOR . 'redis-client.php';
+        $container = new Container();
+        $container->set(Client::class, $di[Client::class]);
+        $container->set(LoopInterface::class, $loop->reveal());
+        $container->set(LoggerInterface::class, $logger->reveal());
+        $container->set('config.redis.dsn', self::DSN);
+        $client = $container->get(Client::class);
+
+        self::assertInstanceOf(Client::class, $client);
+    }
+}
diff --git a/tests/RedisClient.php b/tests/RedisClient.php
deleted file mode 100644
index 70133fc..0000000
--- a/tests/RedisClient.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace PHPDIDefinitions\Tests\Clue\Redis\Client;
-
-use Clue\React\Redis\Client;
-use Evenement\EventEmitterTrait;
-
-class RedisClient implements Client
-{
-    use EventEmitterTrait;
-
-    public function __call($name, $args)
-    {
-        // TODO: Implement __call() method.
-    }
-
-    public function incr(...$args)
-    {
-    }
-
-    public function end()
-    {
-        // TODO: Implement end() method.
-    }
-
-    public function close()
-    {
-        // TODO: Implement close() method.
-    }
-}
diff --git a/tests/WaitingClientTest.php b/tests/WaitingClientTest.php
deleted file mode 100644
index d32e424..0000000
--- a/tests/WaitingClientTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace PHPDIDefinitions\Tests\Clue\Redis\Client;
-
-use ApiClients\Tools\TestUtilities\TestCase;
-use Clue\React\Redis\Client;
-use Clue\React\Redis\Factory;
-use PHPDIDefinitions\Clue\Redis\Client\WaitingClient;
-use Prophecy\Argument;
-use Psr\Log\LoggerInterface;
-use React\EventLoop\LoopInterface;
-use React\Promise\Deferred;
-use function React\Promise\resolve;
-
-final class WaitingClientTest extends TestCase
-{
-    private const DSN = 'redis://::1/13';
-
-    public function testCreate()
-    {
-        $loop = $this->prophesize(LoopInterface::class);
-
-        $logger = $this->prophesize(LoggerInterface::class);
-        $logger->debug('Connecting')->shouldBeCalled();
-        $logger->debug('Connected')->shouldNotBeCalled();
-        $logger->debug('Executing 0 waiting call(s)')->shouldNotBeCalled();
-        $logger->debug('Executed all waiting calls, any new calls will be send to Redis directly')->shouldNotBeCalled();
-
-        WaitingClient::create($loop->reveal(), self::DSN, $logger->reveal());
-    }
-
-    public function testLogging()
-    {
-        $logger = $this->prophesize(LoggerInterface::class);
-        $logger->debug('Connecting')->shouldBeCalled();
-        $logger->debug('Connected')->shouldBeCalled();
-        $logger->debug('Executing 0 waiting call(s)')->shouldBeCalled();
-        $logger->debug('Executed all waiting calls, any new calls will be send to Redis directly')->shouldBeCalled();
-
-        $redisFactory = $this->prophesize(Factory::class);
-        $redisFactory->createClient(self::DSN)->shouldbeCalled()->willReturn(resolve($this->prophesize(Client::class)->reveal()));
-
-        new WaitingClient($redisFactory->reveal(), self::DSN, $logger->reveal());
-    }
-
-    public function testCalls()
-    {
-        $logger = $this->prophesize(LoggerInterface::class);
-        $logger->debug(Argument::type('string'))->shouldBeCalled();
-        $logger->debug('Executing 1 waiting call(s)')->shouldBeCalled();
-
-        $deferred = new Deferred();
-
-        $redis = $this->prophesize(RedisClient::class);
-        $redis->incr('key')->shouldBeCalled()->willReturn(resolve(true));
-        $redis->incr('sleutel')->shouldBeCalled()->willReturn(resolve(true));
-
-        $redisFactory = $this->prophesize(Factory::class);
-        $redisFactory->createClient(self::DSN)->shouldbeCalled()->willReturn($deferred->promise());
-
-        $waitingClient = new WaitingClient($redisFactory->reveal(), self::DSN, $logger->reveal());
-
-        $waitingClient->incr('key');
-
-        $deferred->resolve($redis->reveal());
-
-        $waitingClient->incr('sleutel');
-    }
-}