diff --git a/src/test/java/org/opensearch/plugin/insights/core/service/grouper/MinMaxQueryGrouperByNoneIT.java b/src/test/java/org/opensearch/plugin/insights/core/service/grouper/MinMaxQueryGrouperByNoneIT.java
index 6fd2083..a3f70c6 100644
--- a/src/test/java/org/opensearch/plugin/insights/core/service/grouper/MinMaxQueryGrouperByNoneIT.java
+++ b/src/test/java/org/opensearch/plugin/insights/core/service/grouper/MinMaxQueryGrouperByNoneIT.java
@@ -22,10 +22,10 @@ public class MinMaxQueryGrouperByNoneIT extends QueryInsightsRestTestCase {
      */
     public void testGroupingByNone() throws IOException, InterruptedException {
 
-        waitForEmptyTopQueriesResponse();
-
         updateClusterSettings(this::groupByNoneSettings);
 
+        waitForEmptyTopQueriesResponse();
+
         // Search
         doSearch("range", 2);
         doSearch("match", 6);
diff --git a/src/test/java/org/opensearch/plugin/insights/core/service/grouper/MinMaxQueryGrouperBySimilarityIT.java b/src/test/java/org/opensearch/plugin/insights/core/service/grouper/MinMaxQueryGrouperBySimilarityIT.java
index 069ea43..0fba332 100644
--- a/src/test/java/org/opensearch/plugin/insights/core/service/grouper/MinMaxQueryGrouperBySimilarityIT.java
+++ b/src/test/java/org/opensearch/plugin/insights/core/service/grouper/MinMaxQueryGrouperBySimilarityIT.java
@@ -25,10 +25,10 @@ public class MinMaxQueryGrouperBySimilarityIT extends QueryInsightsRestTestCase
      */
     public void testGroupingBySimilarity() throws IOException, InterruptedException {
 
-        waitForEmptyTopQueriesResponse();
-
         updateClusterSettings(this::defaultTopQueryGroupingSettings);
 
+        waitForEmptyTopQueriesResponse();
+
         // Search
         doSearch("range", 2);
         doSearch("match", 6);