diff --git a/test/tests/containers/TestMap.h b/test/tests/containers/TestMap.h
index 42cae26a..231324ef 100644
--- a/test/tests/containers/TestMap.h
+++ b/test/tests/containers/TestMap.h
@@ -222,9 +222,11 @@ class TestMap : public Test {
             rp3d_test(map3.size() == 3);
             it = map3.begin();
             it = map3.remove(it);
-            rp3d_test(!map3.containsKey(1));
             rp3d_test(map3.size() == 2);
-            rp3d_test(it->second == 20);
+            it = map3.remove(it);
+            rp3d_test(map3.size() == 1);
+            it = map3.remove(it);
+            rp3d_test(map3.size() == 0);
 
             map3.add(Pair<int, int>(56, 32));
             map3.add(Pair<int, int>(23, 89));
diff --git a/test/tests/containers/TestSet.h b/test/tests/containers/TestSet.h
index af46fe43..7b11a76c 100644
--- a/test/tests/containers/TestSet.h
+++ b/test/tests/containers/TestSet.h
@@ -232,9 +232,11 @@ class TestSet : public Test {
             rp3d_test(set3.size() == 3);
             auto it = set3.begin();
             it = set3.remove(it);
-            rp3d_test(!set3.contains(1));
             rp3d_test(set3.size() == 2);
-            rp3d_test(*it == 2);
+            it = set3.remove(it);
+            rp3d_test(set3.size() == 1);
+            it = set3.remove(it);
+            rp3d_test(set3.size() == 0);
 
             set3.add(6);
             set3.add(7);