diff --git a/.travis.yml b/.travis.yml
index 1323b929..d718f072 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: scala
 
+env:
+  - AKKA_TEST_TIMEFACTOR=2.0
+
 scala:
   - 2.12.2
   - 2.11.11
diff --git a/src/main/scala/eventstore/tcp/ConnectionActor.scala b/src/main/scala/eventstore/tcp/ConnectionActor.scala
index e274b56f..4ee135ed 100644
--- a/src/main/scala/eventstore/tcp/ConnectionActor.scala
+++ b/src/main/scala/eventstore/tcp/ConnectionActor.scala
@@ -142,7 +142,7 @@ private[eventstore] class ConnectionActor(settings: Settings) extends Actor with
             case PackIn(Failure(NotHandled(NotMaster(x))), _) => reconnect(x.tcpAddress, "NotMaster failure received")
             case ClusterFailure(x) =>
               log.error("Cluster failed with error: {}", x)
-              context stop self
+              throw new RetriesLimitReachedException(x.toString)
           }
       }
 
diff --git a/src/test/resources/reference.conf b/src/test/resources/reference.conf
new file mode 100644
index 00000000..61194e32
--- /dev/null
+++ b/src/test/resources/reference.conf
@@ -0,0 +1,2 @@
+akka.test.timefactor = 1.0
+akka.test.timefactor = ${?AKKA_TEST_TIMEFACTOR}
\ No newline at end of file