diff --git a/server/src/test/java/org/opensearch/index/mapper/IpFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/IpFieldTypeTests.java
index 1ec5065e3ec95..1baf45b60ac45 100644
--- a/server/src/test/java/org/opensearch/index/mapper/IpFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/IpFieldTypeTests.java
@@ -129,14 +129,12 @@ public void testTermsQuery() {
         );
 
         // if the list includes a prefix query we fallback to a bool query
-        assertEquals(
-            new ConstantScoreQuery(
-                new BooleanQuery.Builder().add(ft.termQuery("::2/16", null), Occur.SHOULD)
-                    .add(ft.termQuery("::42", null), Occur.SHOULD)
-                    .build()
-            ),
-            ft.termsQuery(Arrays.asList("::42", "::2/16"), null)
-        );
+        Query actual = ft.termsQuery(Arrays.asList("::42", "::2/16"), null);
+        assertTrue(actual instanceof ConstantScoreQuery);
+        assertTrue(((ConstantScoreQuery) actual).getQuery() instanceof BooleanQuery);
+        BooleanQuery bq = (BooleanQuery) ((ConstantScoreQuery) actual).getQuery();
+        assertEquals(2, bq.clauses().size());
+        assertTrue(bq.clauses().stream().allMatch(c -> c.getOccur() == Occur.SHOULD));
     }
 
     public void testRangeQuery() {