diff --git a/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
index c835271fe..8e5923159 100755
--- a/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
@@ -3,7 +3,6 @@ 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;
@@ -52,6 +51,8 @@ public class DemoChronicleMapTest {
                 assertNotNull(v);
             }
         }
+
+        file.delete();
     }
 
     @Ignore
@@ -97,6 +98,7 @@ public class DemoChronicleMapTest {
                 assertNotNull(v);
             }
         }
+        file.delete();
     }
 }
 
diff --git a/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java b/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java
index 6a232599a..62ded4aa4 100644
--- a/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java
@@ -219,8 +219,12 @@ public class EntryCountMapTest {
         int stride = 1 + random.nextInt(100);
         int maxKeySize = "key:".length() +
                 (int) round(log10(moreThanMaxSize(maxSize) * stride + counter)) + 1;
-        ChronicleMap<CharSequence, LongValue> map = getSharedMap(minSize, segments, maxKeySize);
-        testEntriesMaxSize0(segments, minSize, maxSize, counter, stride, map);
+        File file;
+        try (ChronicleMap<CharSequence, LongValue> map = getSharedMap(minSize, segments, maxKeySize)) {
+            file = map.file();
+            testEntriesMaxSize0(segments, minSize, maxSize, counter, stride, map);
+        }
+        file.delete();
     }
 
     void testEntriesMaxSize0(int segments, int minSize, int maxSize, int counter, int stride,
diff --git a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java
index e489f461b..0529547ca 100644
--- a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java
@@ -27,7 +27,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.Set;
@@ -44,12 +43,6 @@ public class TimeBasedReplicationTest extends JSR166TestCase {
 
     public static final byte IDENTIFIER = 1;
 
-    private static File getPersistenceFile() {
-        String TMP = System.getProperty("java.io.tmpdir");
-        File file = new File(TMP + "/chm-test" + System.nanoTime());
-        file.deleteOnExit();
-        return file;
-    }
 
     Set<Thread> threads;
 
diff --git a/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java b/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java
index 9682814f7..6e1b035c3 100644
--- a/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java
+++ b/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java
@@ -111,12 +111,6 @@ public class MapCheck {
             serTest(size);
     }
 
-    private static File getPersistenceFile() {
-        String TMP = System.getProperty("java.io.tmpdir");
-        File file = new File(TMP + "/chm-test" + System.nanoTime());
-        file.deleteOnExit();
-        return file;
-    }
 
     static Map newMap() {
         try {