diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java
index d8a1debb7..4eb220d96 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java
@@ -83,7 +83,7 @@ public class TCPSocketReplication3wayPutReturnsNullTest {
         map3.put(5, "EXAMPLE-2");
 
         // allow time for the recompilation to resolve
-        waitTillEqual(5000);
+        waitTillEqual(15000);
 
         assertEquals(map1, map2);
         assertEquals(map3, map2);
@@ -107,7 +107,7 @@ public class TCPSocketReplication3wayPutReturnsNullTest {
         map2.put(5, "EXAMPLE-2");
 
         // allow time for the recompilation to resolve
-        waitTillEqual(5000);
+        waitTillEqual(15000);
 
         assertEquals(map1, map2);
         assertEquals(map3, map3);
@@ -133,7 +133,7 @@ public class TCPSocketReplication3wayPutReturnsNullTest {
         map2.putIfAbsent(5, "EXAMPLE-2");
 
         // allow time for the recompilation to resolve
-        waitTillEqual(5000);
+        waitTillEqual(15000);
 
         assertEquals(map1, map2);
         assertEquals(map3, map3);
diff --git a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java
index 5677a48c0..0bea14b02 100644
--- a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java
+++ b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java
@@ -68,7 +68,7 @@ public class SetForTCPSocketReplication3wayTest {
 
     @After
     public void tearDown() throws InterruptedException {
-        Thread.sleep(5);
+
         for (final Closeable closeable : new Closeable[]{set1, set2, set3}) {
             try {
                 closeable.close();
@@ -133,7 +133,7 @@ public class SetForTCPSocketReplication3wayTest {
         set2.add(5);
 
         // allow time for the recompilation to resolve
-        waitTillEqual(5000);
+        waitTillEqual(15000);
 
         assertEquals(set1, set2);
         assertEquals(set3, set3);