diff --git a/rest-api-spec/test/indices.open/10_basic.yaml b/rest-api-spec/test/indices.open/10_basic.yaml
index 6b8846bfa85..122043b4c42 100644
--- a/rest-api-spec/test/indices.open/10_basic.yaml
+++ b/rest-api-spec/test/indices.open/10_basic.yaml
@@ -3,10 +3,13 @@
   - do:
       indices.create:
         index: test_index
+        body:
+          settings:
+            number_of_replicas: 0
 
   - do:
       cluster.health:
-        wait_for_status: yellow
+        wait_for_status: green
 
   - do:
       indices.close:
@@ -23,7 +26,7 @@
 
   - do:
       cluster.health:
-        wait_for_status: yellow
+        wait_for_status: green
 
   - do:
       search:
diff --git a/rest-api-spec/test/indices.open/20_multiple_indices.yaml b/rest-api-spec/test/indices.open/20_multiple_indices.yaml
index 8a32cc4b3ba..a53d889097e 100644
--- a/rest-api-spec/test/indices.open/20_multiple_indices.yaml
+++ b/rest-api-spec/test/indices.open/20_multiple_indices.yaml
@@ -2,15 +2,24 @@ setup:
   - do:
       indices.create:
         index: test_index1
+        body:
+          settings:
+            number_of_replicas: 0
   - do:
       indices.create:
         index: test_index2
+        body:
+          settings:
+            number_of_replicas: 0
   - do:
       indices.create:
         index: test_index3
+        body:
+          settings:
+            number_of_replicas: 0
   - do:
       cluster.health:
-        wait_for_status: yellow
+        wait_for_status: green
 
 ---
 "All indices":
@@ -29,7 +38,7 @@ setup:
 
   - do:
       cluster.health:
-        wait_for_status: yellow
+        wait_for_status: green
 
   - do:
       search:
@@ -52,7 +61,7 @@ setup:
 
   - do:
       cluster.health:
-        wait_for_status: yellow
+        wait_for_status: green
 
   - do:
       search:
@@ -75,7 +84,7 @@ setup:
 
   - do:
       cluster.health:
-        wait_for_status: yellow
+        wait_for_status: green
 
   - do:
       search: