diff --git a/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java
index 4dce3fd53b71b..e6c1bade759e8 100644
--- a/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java
+++ b/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java
@@ -492,4 +492,15 @@ private static IndexMetaData newIndexMeta(String name, Settings oldIndexSettings
             .build();
         return IndexMetaData.builder(name).settings(build).build();
     }
+
+
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/36598")
+    @Override
+    public void testMustRewrite() throws IOException {
+    }
+
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/36598")
+    @Override
+    public void testToQuery() throws IOException {
+    }
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java
index 16f52473f4254..7647a9e6d6546 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java
@@ -413,7 +413,6 @@ protected boolean builderGeneratesCacheableQueries() {
      * Test creates the {@link Query} from the {@link QueryBuilder} under test and delegates the
      * assertions being made on the result to the implementing subclass.
      */
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/36598")
     public void testToQuery() throws IOException {
         for (int runs = 0; runs < NUMBER_OF_TESTQUERIES; runs++) {
             QueryShardContext context = createShardContext();
@@ -798,7 +797,6 @@ private static String msg(String left, String right) {
      * This test ensures that queries that need to be rewritten have dedicated tests.
      * These queries must override this method accordingly.
      */
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/36598")
     public void testMustRewrite() throws IOException {
         QueryShardContext context = createShardContext();
         context.setAllowUnmappedFields(true);