diff --git a/src/test/java/net/openhft/chronicle/map/TestBooleanValues.java b/src/test/java/net/openhft/chronicle/map/BooleanValuesTest.java
similarity index 97%
rename from src/test/java/net/openhft/chronicle/map/TestBooleanValues.java
rename to src/test/java/net/openhft/chronicle/map/BooleanValuesTest.java
index 20f10db07..2f8a71154 100644
--- a/src/test/java/net/openhft/chronicle/map/TestBooleanValues.java
+++ b/src/test/java/net/openhft/chronicle/map/BooleanValuesTest.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 /**
  * @author Rob Austin.
  */
-public class TestBooleanValues {
+public class BooleanValuesTest {
 
     /**
      * see issue http://stackoverflow.com/questions/26219313/strange-npe-from-chronicle-map-toy-code
diff --git a/src/test/java/net/openhft/chronicle/map/EventListenerTestWithTCPSocketReplication.java b/src/test/java/net/openhft/chronicle/map/EventListenerWithTCPSocketReplicationTest.java
similarity index 99%
rename from src/test/java/net/openhft/chronicle/map/EventListenerTestWithTCPSocketReplication.java
rename to src/test/java/net/openhft/chronicle/map/EventListenerWithTCPSocketReplicationTest.java
index 3d00cb137..8eb4afd4d 100644
--- a/src/test/java/net/openhft/chronicle/map/EventListenerTestWithTCPSocketReplication.java
+++ b/src/test/java/net/openhft/chronicle/map/EventListenerWithTCPSocketReplicationTest.java
@@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicReference;
  *
  * @author Rob Austin.
  */
-public class EventListenerTestWithTCPSocketReplication {
+public class EventListenerWithTCPSocketReplicationTest {
 
     ChronicleMap<Integer, CharSequence> map1;
     ChronicleMap<Integer, CharSequence> map2;
diff --git a/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java b/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java
index 85d572a40..2ef6178ef 100644
--- a/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java
@@ -22,6 +22,8 @@ import net.openhft.chronicle.hash.replication.SingleChronicleHashReplication;
 import net.openhft.chronicle.hash.replication.UdpTransportConfig;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -75,8 +77,8 @@ public class UDPSocketReplicationTest {
         System.gc();
     }
 
-  /*  @Test
-     @Ignore
+    @Test
+    @Ignore
     public void testBufferOverflow() throws IOException, InterruptedException {
 
         for (int i = 0; i < 1024; i++) {
@@ -84,7 +86,7 @@ public class UDPSocketReplicationTest {
             map2.put(i * 2, "E");
             System.out.println("" + map2);
         }
-    }*/
+    }
 
 }