diff --git a/tests/ClientTest.php b/tests/ClientTest.php
index <HASH>..<HASH> 100644
--- a/tests/ClientTest.php
+++ b/tests/ClientTest.php
@@ -164,14 +164,22 @@ class ClientTest extends TestCase
     protected function createClient()
     {
         $client = null;
+        $exception = null;
+
         self::$factory->createClient()->then(function ($c) use (&$client) {
             $client = $c;
+        }, function($error) use (&$exception) {
+            $exception = $error;
         });
 
-        while ($client === null) {
+        while ($client === null && $exception === null) {
             self::$loop->tick();
         }
 
+        if ($exception !== null) {
+            throw $exception;
+        }
+
         return $client;
     }
Throw exception if redis is not running