diff --git a/javatests/google/registry/export/ExportConstantsTest.java b/javatests/google/registry/export/ExportConstantsTest.java
index 9cdf33ffd..42d5972cc 100644
--- a/javatests/google/registry/export/ExportConstantsTest.java
+++ b/javatests/google/registry/export/ExportConstantsTest.java
@@ -64,7 +64,7 @@ public class ExportConstantsTest {
 
   @Test
   public void testReportingKinds_areSubsetOfBackupKinds() {
-    assertThat(getBackupKinds()).containsAllIn(getReportingKinds());
+    assertThat(getBackupKinds()).containsAtLeastElementsIn(getReportingKinds());
   }
 
   private static void checkKindsMatchGoldenFile(
diff --git a/javatests/google/registry/model/EntityClassesTest.java b/javatests/google/registry/model/EntityClassesTest.java
index d678a38dc..5966a9c7b 100644
--- a/javatests/google/registry/model/EntityClassesTest.java
+++ b/javatests/google/registry/model/EntityClassesTest.java
@@ -67,7 +67,9 @@ public class EntityClassesTest {
             .filter(hasAnnotation(EntitySubclass.class))
             .map(Key::getKind)
             .collect(toImmutableSet());
-    assertWithMessage("base entity kinds").that(baseEntityKinds).containsAllIn(entitySubclassKinds);
+    assertWithMessage("base entity kinds")
+        .that(baseEntityKinds)
+        .containsAtLeastElementsIn(entitySubclassKinds);
   }
 
   @Test
diff --git a/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java b/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java
index 10f5052d0..7418a1a29 100644
--- a/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java
+++ b/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java
@@ -130,7 +130,7 @@ public class KillAllEppResourcesActionTest extends MapreduceTestCase<KillAllEppR
       }
     }
     ImmutableMultimap<String, Object> beforeContents = getDatastoreContents();
-    assertThat(beforeContents.keySet()).containsAllIn(AFFECTED_KINDS);
+    assertThat(beforeContents.keySet()).containsAtLeastElementsIn(AFFECTED_KINDS);
     assertThat(difference(beforeContents.keySet(), AFFECTED_KINDS)).isNotEmpty();
     runMapreduce();
     ofy().clearSessionCache();