diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
index 1bc126e26..7bd73d280 100644
--- a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
@@ -260,6 +260,19 @@ abstract class AbstractChannelReplicator implements Closeable {
         isClosed = true;
         // context.close();
         executorService.shutdown();
+
+
+        try {
+            executorService.awaitTermination(5, TimeUnit.MILLISECONDS);
+        } catch (Exception e) {
+            executorService.shutdownNow();
+            try {
+                executorService.awaitTermination(10, TimeUnit.SECONDS);
+            } catch (InterruptedException e1) {
+                LOG.error("", e);
+            }
+        }
+
         closeables.closeQuietly();
 
     }
diff --git a/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
index 0da6bdfcd..b64f9b01a 100755
--- a/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
@@ -3,6 +3,7 @@ package net.openhft.chronicle.map;
 import net.openhft.lang.model.DataValueClasses;
 import net.openhft.lang.model.constraints.MaxSize;
 import net.openhft.lang.values.IntValue;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
@@ -15,7 +16,7 @@ public class DemoChronicleMapTest {
 
     @Test
     public void testMap() throws Exception {
-        File file = File.createTempFile("DummyOrders", ".test");
+        File file = File.createTempFile("DummyOrders"+System.currentTimeMillis(), ".test");
         file.deleteOnExit();
         int maxEntries = 1000;
         try (ChronicleMap<IntValue, DemoOrderVOInterface> map = ChronicleMapBuilder
@@ -55,7 +56,7 @@ public class DemoChronicleMapTest {
 
     @Test
     public void testMapLocked() throws Exception {
-        File file = File.createTempFile("DummyOrders", ".test");
+        File file = File.createTempFile("DummyOrders-"+System.currentTimeMillis(), ".test");
         file.deleteOnExit();
         int maxEntries = 1000;
         try (ChronicleMap<IntValue, DemoOrderVOInterface> map = ChronicleMapBuilder
diff --git a/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java b/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java
index d4bbe7699..338d18dc9 100644
--- a/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java
+++ b/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java
@@ -46,7 +46,7 @@ public class LargeEntriesTest {
         final int ENTRIES = 250;
         final int ENTRY_SIZE = 100 * 1024;
 
-        File file = File.createTempFile("largeEntries", ".deleteme");
+        File file = File.createTempFile("largeEntries" + System.currentTimeMillis(), ".deleteme");
         file.deleteOnExit();
         final ChronicleMap<String, String> map = ChronicleMapBuilder
                 .of(String.class, String.class)