diff --git a/test/unit/voldemort/server/EndToEndTest.java b/test/unit/voldemort/server/EndToEndTest.java
index 45dbe3bf24..f8e9c798c8 100644
--- a/test/unit/voldemort/server/EndToEndTest.java
+++ b/test/unit/voldemort/server/EndToEndTest.java
@@ -120,8 +120,7 @@ public void testSanity() {
 
         assertEquals("getAll works as expected", "Moscow", capitals.get("Russia").getValue());
         assertEquals("getAll works as expected", "Kiev", capitals.get("Ukraine").getValue());
-        assertTrue("getAll works as expected",
-                   !capitals.containsKey("Japan") || capitals.get("Japan") == null);
+        assertTrue("getAll works as expected", capitals.get("Japan") == null);
 
         storeClient.delete("Ukraine");
         assertNull("delete works as expected", storeClient.get("Ukraine"));
diff --git a/test/unit/voldemort/store/routed/GetallNodeReachTest.java b/test/unit/voldemort/store/routed/GetallNodeReachTest.java
index 8f03c495df..869c4a0ed1 100644
--- a/test/unit/voldemort/store/routed/GetallNodeReachTest.java
+++ b/test/unit/voldemort/store/routed/GetallNodeReachTest.java
@@ -249,19 +249,13 @@ public void testGetall_211_zoneCountRead_1() throws Exception {
     public void testGetall_322() throws Exception {
         cluster = getEightNodeClusterWithZones();
         HashMap<Integer, Integer> zoneReplicationFactor = new HashMap<Integer, Integer>();
-        zoneReplicationFactor.put(0, 4);
-        zoneReplicationFactor.put(1, 4);
-        /*
-         * First n nodes on the preference list will be one node from each
-         * remote n zones, where n=zoneCountReads, therefore preferred read
-         * should be set > n if want to include local zone node results in
-         * parallel request
-         */
+        zoneReplicationFactor.put(0, 3);
+        zoneReplicationFactor.put(1, 3);
         storeDef = new StoreDefinitionBuilder().setName("test")
                                                .setType(InMemoryStorageConfiguration.TYPE_NAME)
                                                .setRoutingPolicy(RoutingTier.CLIENT)
                                                .setRoutingStrategyType(RoutingStrategyType.ZONE_STRATEGY)
-                                               .setReplicationFactor(8)
+                                               .setReplicationFactor(6)
                                                .setZoneReplicationFactor(zoneReplicationFactor)
                                                .setKeySerializer(new SerializerDefinition("string"))
                                                .setValueSerializer(new SerializerDefinition("string"))