diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java
index 7db2704728c..4481ebb3526 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java
@@ -1979,6 +1979,7 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
         assertNotNull(detailsResponse.detail());
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/57")
     public void testFreezeAndUnfreeze() throws IOException {
         createIndex("test", Settings.EMPTY);
         RestHighLevelClient client = highLevelClient();
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java
index ccbde16c90a..c53b4cc6f08 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java
@@ -1380,6 +1380,7 @@ public class SearchIT extends ESRestHighLevelClientTestCase {
         assertEquals(3, countResponse.getCount());
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/61")
     public void testSearchWithBasicLicensedQuery() throws IOException {
         SearchRequest searchRequest = new SearchRequest("index");
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java
index de150b72721..27468925798 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java
@@ -2952,6 +2952,7 @@ public class IndicesClientDocumentationIT extends ESRestHighLevelClientTestCase
 
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/57")
     public void testFreezeIndex() throws Exception {
         RestHighLevelClient client = highLevelClient();
 
@@ -3030,6 +3031,7 @@ public class IndicesClientDocumentationIT extends ESRestHighLevelClientTestCase
         }
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/57")
     public void testUnfreezeIndex() throws Exception {
         RestHighLevelClient client = highLevelClient();