diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/WeakValueMapTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/WeakValueMapTest.java
index 74cca8c044..0cdc0cec76 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/WeakValueMapTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/WeakValueMapTest.java
@@ -215,12 +215,10 @@ public void testConcurrentModification() {
         map.put("key_4", 321);
         assertEquals(4, map.size());
 
-        for(Map.Entry<String, Integer> entry : map.entrySet()) {
-            if("key_2".equals(entry.getKey())) {
-                map.remove("key_2");
-            }
+        for (String key : map.keySet()) {
+            map.remove(key);
         }
-    }
+}
 
     @Test(expected = UnsupportedOperationException.class)
     public void testUnsupportedEntryIteratorRemoval() {