diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
index 8983bcaa7..d68d412e6 100644
--- a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
@@ -1133,8 +1133,7 @@ public class ChronicleMapTest {
     private ChronicleMap<Integer, CharSequence> getViewTestMap(int noOfElements) throws IOException {
         ChronicleMap<Integer, CharSequence> map =
                 ChronicleMapBuilder.of(Integer.class, CharSequence.class)
-                        .entries(noOfElements)
-                        .minSegments(16)
+                        .entries(noOfElements * 2)
                         .valueSize((noOfElements + "").length())
                         .putReturnsNull(true)
                         .removeReturnsNull(true).create();
@@ -1154,7 +1153,7 @@ public class ChronicleMapTest {
     @Test
     public void testOversizeEntriesPutRemoveReplace() throws IOException {
         ChronicleMapBuilder builder = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
-                .entries(2)
+                .entries(10)
                 .minSegments(1)
                 .entrySize(10);
         builder.entryAndValueAlignment(NO_ALIGNMENT);
diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java
index 93a67c1ea..7620fb4a3 100644
--- a/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java
@@ -106,7 +106,7 @@ public class ChronicleMapTest extends JSR166TestCase {
      * Returns a new map from Integers 1-5 to Strings "A"-"E".
      */
     private static ChronicleMap map5() throws IOException {
-        ChronicleMap<Integer, CharSequence> map = newShmIntString(5);
+        ChronicleMap<Integer, CharSequence> map = newShmIntString(10);
         assertTrue(map.isEmpty());
         map.put(one, "A");
         map.put(two, "B");