diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yaml
index 763738303b8..e88a3ea154f 100755
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yaml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yaml
@@ -45,9 +45,6 @@
         type: type
         body: { foo: bar }
         refresh: true
-  - do:
-       cluster.health:
-         wait_for_status: green
   - do:
       cat.segments: {}
   - match:
@@ -62,11 +59,6 @@
           settings:
             number_of_shards: "3"
             number_of_replicas: "0"
-  - do:
-       cluster.health:
-         wait_for_status: green
-         wait_for_relocating_shards: 0
-
   - do:
       index:
         index: index2
@@ -102,10 +94,6 @@
             number_of_shards: "1"
             number_of_replicas: "0"
 
-  - do:
-       cluster.health:
-         wait_for_status: green
-
   - do:
       indices.close:
         index: index1
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yaml
index f13924d81ed..5e4a6b63697 100755
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yaml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yaml
@@ -87,9 +87,6 @@
             number_of_shards: 5
             number_of_replicas: 0
 
-  - do:
-      cluster.health:
-        wait_for_status: green
   - do:
       indices.flush_synced:
         index: sync_id_test
@@ -116,10 +113,6 @@
             number_of_shards: 5
             number_of_replicas: 0
 
-  - do:
-      cluster.health:
-        wait_for_status: green
-
   - do:
       cat.shards:
         index: sync_id_no_flush_test
@@ -153,9 +146,6 @@
           settings:
             number_of_shards: "5"
             number_of_replicas: "0"
-  - do:
-       cluster.health:
-         wait_for_relocating_shards: 0
 
   - do:
       cat.shards: {}
@@ -179,9 +169,6 @@
             number_of_replicas: "1"
             shadow_replicas: true
             shared_filesystem: false
-  - do:
-       cluster.health:
-         wait_for_relocating_shards: 0
 
   - do:
       cat.shards: