diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
index 158037e09b..1712046be9 100644
--- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
+++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java
@@ -1947,9 +1947,8 @@ public void arrayContainsAnyQueries() throws Exception {
     if (getFirestoreEdition() == FirestoreEdition.STANDARD) {
       assertEquals(asList("a", "b", "d", "e"), querySnapshotToIds(query.get().get()));
     } else {
-      // TODO: Currently rejected because of mixed type setup, backend will change the behavior; and
-      // this test will fail by then.
-      assertThrows(ExecutionException.class, () -> querySnapshotToIds(query.get().get()));
+      assertThat(querySnapshotToIds(query.get().get()))
+          .containsExactlyElementsIn(asList("a", "b", "d", "e"));
     }
   }