diff --git a/javatests/google/registry/rde/RdeStagingActionTest.java b/javatests/google/registry/rde/RdeStagingActionTest.java
index e7cb3d8e5..6f84e7465 100644
--- a/javatests/google/registry/rde/RdeStagingActionTest.java
+++ b/javatests/google/registry/rde/RdeStagingActionTest.java
@@ -768,7 +768,7 @@ public class RdeStagingActionTest extends MapreduceTestCase<RdeStagingAction> {
         ImmutableList.copyOf(listResult).stream().map(ListItem::getName).collect(toImmutableSet());
     for (String tld : tlds) {
       assertThat(filenames)
-          .containsAllOf(
+          .containsAtLeast(
               "manual/test/" + tld + "_2000-01-01_full_S1_R" + revision + "-report.xml.ghostryde",
               "manual/test/" + tld + "_2000-01-01_full_S1_R" + revision + ".xml.ghostryde",
               "manual/test/" + tld + "_2000-01-01_full_S1_R" + revision + ".xml.length",
diff --git a/javatests/google/registry/request/auth/RequestAuthenticatorTest.java b/javatests/google/registry/request/auth/RequestAuthenticatorTest.java
index 480076137..c1ad33eed 100644
--- a/javatests/google/registry/request/auth/RequestAuthenticatorTest.java
+++ b/javatests/google/registry/request/auth/RequestAuthenticatorTest.java
@@ -277,7 +277,7 @@ public class RequestAuthenticatorTest {
     assertThat(authResult.get().userAuthInfo().get().isUserAdmin()).isFalse();
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo()).isPresent();
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo().get().authorizedScopes())
-      .containsAllOf("test-scope1", "test-scope2");
+        .containsAtLeast("test-scope1", "test-scope2");
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo().get().oauthClientId())
       .isEqualTo("test-client-id");
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo().get().rawAccessToken())
@@ -300,7 +300,7 @@ public class RequestAuthenticatorTest {
     assertThat(authResult.get().userAuthInfo().get().isUserAdmin()).isTrue();
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo()).isPresent();
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo().get().authorizedScopes())
-      .containsAllOf("test-scope1", "test-scope2");
+        .containsAtLeast("test-scope1", "test-scope2");
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo().get().oauthClientId())
       .isEqualTo("test-client-id");
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo().get().rawAccessToken())
@@ -369,7 +369,7 @@ public class RequestAuthenticatorTest {
     assertThat(authResult.get().userAuthInfo().get().isUserAdmin()).isFalse();
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo()).isPresent();
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo().get().authorizedScopes())
-      .containsAllOf("test-scope1", "test-scope2", "test-scope3");
+        .containsAtLeast("test-scope1", "test-scope2", "test-scope3");
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo().get().oauthClientId())
       .isEqualTo("test-client-id");
     assertThat(authResult.get().userAuthInfo().get().oauthTokenInfo().get().rawAccessToken())
diff --git a/javatests/google/registry/tools/GenerateDnsReportCommandTest.java b/javatests/google/registry/tools/GenerateDnsReportCommandTest.java
index 367c075b5..d2affc61b 100644
--- a/javatests/google/registry/tools/GenerateDnsReportCommandTest.java
+++ b/javatests/google/registry/tools/GenerateDnsReportCommandTest.java
@@ -162,7 +162,7 @@ public class GenerateDnsReportCommandTest extends CommandTestCase<GenerateDnsRep
     runCommand("--output=" + output, "--tld=xn--q9jyb4c");
     Iterable<?> output = (Iterable<?>) getOutputAsJson();
     assertThat(output).containsAnyOf(DOMAIN1_OUTPUT, DOMAIN1_OUTPUT_ALT);
-    assertThat(output).containsAllOf(DOMAIN2_OUTPUT, NAMESERVER1_OUTPUT, NAMESERVER2_OUTPUT);
+    assertThat(output).containsAtLeast(DOMAIN2_OUTPUT, NAMESERVER1_OUTPUT, NAMESERVER2_OUTPUT);
   }
 
   @Test
@@ -179,7 +179,7 @@ public class GenerateDnsReportCommandTest extends CommandTestCase<GenerateDnsRep
     runCommand("--output=" + output, "--tld=xn--q9jyb4c");
     Iterable<?> output = (Iterable<?>) getOutputAsJson();
     assertThat(output).containsAnyOf(DOMAIN1_OUTPUT, DOMAIN1_OUTPUT_ALT);
-    assertThat(output).containsAllOf(DOMAIN2_OUTPUT, NAMESERVER2_OUTPUT);
+    assertThat(output).containsAtLeast(DOMAIN2_OUTPUT, NAMESERVER2_OUTPUT);
   }
 
   @Test