diff --git a/rest-api-spec/test/indices.delete_mapping/10_basic.yaml b/rest-api-spec/test/indices.delete_mapping/10_basic.yaml
index bd0f0fe42a6..68c3e375142 100644
--- a/rest-api-spec/test/indices.delete_mapping/10_basic.yaml
+++ b/rest-api-spec/test/indices.delete_mapping/10_basic.yaml
@@ -4,6 +4,8 @@
         indices.create:
           index: test_index
           body:
+              settings:
+                number_of_replicas: 0
               mappings:
                 test_type:
                   properties:
@@ -13,7 +15,7 @@
 
   - do:
         cluster.health:
-         wait_for_status: yellow
+         wait_for_status: green
 
   - do:
       indices.exists_type:
@@ -26,7 +28,7 @@
       indices.delete_mapping:
         index: test_index
         type: test_type
-  
+
   - do:
       indices.exists_type:
         index: test_index
diff --git a/rest-api-spec/test/indices.delete_mapping/all_path_options.yaml b/rest-api-spec/test/indices.delete_mapping/all_path_options.yaml
index 6e5f9ae7323..47b109da8c3 100644
--- a/rest-api-spec/test/indices.delete_mapping/all_path_options.yaml
+++ b/rest-api-spec/test/indices.delete_mapping/all_path_options.yaml
@@ -5,21 +5,24 @@ setup:
         index: test_index1
         body:
             mappings: { test_type1: { }}
+            settings: { number_of_replicas: 0 }
 
   - do:
       indices.create:
         index: test_index2
         body:
             mappings: { test_type2: { }}
+            settings: { number_of_replicas: 0 }
   - do:
       indices.create:
         index: foo
         body:
             mappings: { test_type2: {  }}
+            settings: { number_of_replicas: 0 }
 
   - do:
         cluster.health:
-         wait_for_status: yellow
+         wait_for_status: green
 ---
 "delete with _all index":
   - do:
diff --git a/rest-api-spec/test/indices.put_mapping/10_basic.yaml b/rest-api-spec/test/indices.put_mapping/10_basic.yaml
index e02b948f936..4d07208dc41 100644
--- a/rest-api-spec/test/indices.put_mapping/10_basic.yaml
+++ b/rest-api-spec/test/indices.put_mapping/10_basic.yaml
@@ -3,6 +3,12 @@
   - do:
       indices.create:
         index: test_index
+        body:
+            settings:
+                number_of_replicas: 0
+  - do:
+      cluster.health:
+            wait_for_status: green
 
   - do:
       indices.put_mapping:
@@ -21,7 +27,7 @@
   - do:
       indices.get_mapping:
         index: test_index
-  
+
   - match: {test_index.mappings.test_type.properties.text1.type:     string}
   - match: {test_index.mappings.test_type.properties.text1.analyzer: whitespace}
   - match: {test_index.mappings.test_type.properties.text2.type:     string}
@@ -55,7 +61,7 @@
   - do:
       indices.get_mapping:
         index: test_index
-  
+
   - match: {test_index.mappings.test_type.properties.text1.type:     string}
   - match: {test_index.mappings.test_type.properties.text1.fields.text_raw.index: not_analyzed}
   - match: {test_index.mappings.test_type.properties.text2.type:     string}
diff --git a/rest-api-spec/test/indices.put_mapping/all_path_options.yaml b/rest-api-spec/test/indices.put_mapping/all_path_options.yaml
index 23b02f2cde2..3f785c60eb8 100644
--- a/rest-api-spec/test/indices.put_mapping/all_path_options.yaml
+++ b/rest-api-spec/test/indices.put_mapping/all_path_options.yaml
@@ -2,13 +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: foo
-
+        body:
+            settings:
+                number_of_replicas: 0
+  - do:
+      cluster.health:
+            wait_for_status: green
 
 ---
 "put one mapping per index":