diff --git a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
index e3495a017..a479a9065 100644
--- a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
+++ b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
@@ -41,7 +41,7 @@ public class StatelessClientTest {
     public static final int SIZE = 100000;
 
 
-    @Test
+    @Test(timeout = 5000)
     public void testBufferOverFlowPutAllAndEntrySet() throws IOException, InterruptedException {
 
         final ChronicleMap<Integer, CharSequence> serverMap;
@@ -354,7 +354,6 @@ public class StatelessClientTest {
     }
 
 
-
     @Test
     public void testRemoveWhereRemoveReturnsNull() throws IOException,
             InterruptedException {