diff --git a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java
index f3db0d210..b5c25d5ec 100644
--- a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java
+++ b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java
@@ -7,13 +7,15 @@ import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
 import net.openhft.chronicle.map.fromdocs.BondVOInterface;
 import net.openhft.lang.io.ByteBufferBytes;
 import net.openhft.lang.io.Bytes;
-import net.openhft.lang.io.MappedStore;
 import net.openhft.lang.io.serialization.BytesMarshallable;
 import net.openhft.lang.io.serialization.impl.*;
 import net.openhft.lang.model.constraints.MaxSize;
 import net.openhft.lang.model.constraints.NotNull;
 import net.openhft.lang.values.*;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
@@ -2620,19 +2622,6 @@ public class CHMUseCasesTest {
             }
         }
     }
-
-
-    @BeforeClass
-    public static void initGlobals() {
-        assertFalse("Unfriendly clean in a previous test", MappedStore.unfriendlyClean.getAndSet(false));
-
-    }
-
-    @After
-    public void systemGC() {
-        System.gc();
-        assertFalse("Unfriendly clean", MappedStore.unfriendlyClean.getAndSet(false));
-    }
 }
 
 interface IData extends BytesMarshallable {
diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
index bbdfcd11f..a72b4759a 100755
--- a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
@@ -22,13 +22,14 @@ import com.google.common.collect.HashBiMap;
 import com.google.common.primitives.Ints;
 import net.openhft.chronicle.hash.replication.SingleChronicleHashReplication;
 import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
-import net.openhft.lang.io.MappedStore;
 import net.openhft.lang.model.DataValueClasses;
 import net.openhft.lang.model.DataValueGenerator;
 import net.openhft.lang.values.IntValue;
 import net.openhft.lang.values.LongValue;
 import net.openhft.lang.values.LongValue$$Native;
-import org.junit.*;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -1825,17 +1826,5 @@ public class ChronicleMapTest {
 
         map.close();
     }
-
-    @BeforeClass
-    public static void initGlobals() {
-        assertFalse("Unfriendly clean in a previous test", MappedStore.unfriendlyClean.getAndSet(false));
-
-    }
-
-    @After
-    public void systemGC() {
-        System.gc();
-        assertFalse("Unfriendly clean", MappedStore.unfriendlyClean.getAndSet(false));
-    }
 }
 
diff --git a/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java b/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java
index 08782ebe5..136c02158 100644
--- a/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java
+++ b/src/test/java/net/openhft/chronicle/map/LargeEntriesTest.java
@@ -20,10 +20,7 @@ package net.openhft.chronicle.map;
 
 import net.openhft.lang.io.DirectBytes;
 import net.openhft.lang.io.DirectStore;
-import net.openhft.lang.io.MappedStore;
 import net.openhft.lang.io.serialization.impl.SnappyStringMarshaller;
-import org.junit.After;
-import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -214,16 +211,4 @@ public class LargeEntriesTest {
         xml.close();
         return baos.toString().substring(0, entrySize);
     }
-
-    @BeforeClass
-    public static void initGlobals() {
-        assertFalse("Unfriendly clean in a previous test", MappedStore.unfriendlyClean.getAndSet(false));
-
-    }
-
-    @After
-    public void systemGC() {
-        System.gc();
-        assertFalse("Unfriendly clean", MappedStore.unfriendlyClean.getAndSet(false));
-    }
 }