diff --git a/src/test/kotlin/com/probablycoding/persistent/AbstractMapTest.kt b/src/test/kotlin/com/probablycoding/persistent/AbstractMapTest.kt
index 90dd7d9..2990ad0 100644
--- a/src/test/kotlin/com/probablycoding/persistent/AbstractMapTest.kt
+++ b/src/test/kotlin/com/probablycoding/persistent/AbstractMapTest.kt
@@ -78,7 +78,7 @@ abstract class AbstractMapTest(val supportsNullValues: Boolean = true) {
         val map = buildMap(*pairs.toTypedArray())
         val actual = hashSetOf<Pair<Int, String>>()
 
-        map.forEach { key, value -> actual.add(Pair(key, value)) }
+        map.entries.forEach { actual.add(Pair(it.key, it.value)) }
         assertEquals(pairs, actual)
     }
 
@@ -88,7 +88,7 @@ abstract class AbstractMapTest(val supportsNullValues: Boolean = true) {
         val map = buildMap(*pairs.toTypedArray())
         val actual = hashSetOf<Pair<Int, String>>()
 
-        map.forEach { key, value -> actual.add(Pair(key, value)) }
+        map.entries.forEach { actual.add(Pair(it.key, it.value)) }
         assertEquals(pairs, actual)
     }
 
@@ -118,7 +118,8 @@ abstract class AbstractMapTest(val supportsNullValues: Boolean = true) {
         val map = buildMap(*pairs.toTypedArray())
         val actual = hashSetOf<Pair<CollidingKey, String>>()
 
-        map.forEach { key, value -> actual.add(Pair(key, value)) }
+        map.entries.forEach { actual.add(Pair(it.key, it.value)) }
+
         assertEquals(pairs, actual)
     }
 
@@ -128,7 +129,8 @@ abstract class AbstractMapTest(val supportsNullValues: Boolean = true) {
         val map = buildMap(*pairs.toTypedArray())
         val actual = hashSetOf<Pair<CollidingKey, String>>()
 
-        map.forEach { key, value -> actual.add(Pair(key, value)) }
+        map.entries.forEach { actual.add(Pair(it.key, it.value)) }
+
         assertEquals(pairs, actual)
     }
 
diff --git a/src/test/kotlin/com/probablycoding/persistent/AbstractSortedMapTest.kt b/src/test/kotlin/com/probablycoding/persistent/AbstractSortedMapTest.kt
index 46b8375..65afe74 100644
--- a/src/test/kotlin/com/probablycoding/persistent/AbstractSortedMapTest.kt
+++ b/src/test/kotlin/com/probablycoding/persistent/AbstractSortedMapTest.kt
@@ -28,7 +28,8 @@ abstract class AbstractSortedMapTest(supportsNullValues: Boolean = true) : Abstr
     fun sortedForEach() {
         val map = buildMap(1 to "A", 3 to "C", 2 to "B", 5 to "E", 4 to "D")
         val actual = arrayListOf<Int>()
-        map.forEach { key, value -> actual.add(key) }
+
+        map.entries.forEach { actual.add(it.key) }
         assertEquals(listOf(1, 2, 3, 4, 5), actual)
     }