diff --git a/rest-api-spec/test/indices.stats/10_index.yaml b/rest-api-spec/test/indices.stats/10_index.yaml
index b07da61db0b..7bb596b59e6 100644
--- a/rest-api-spec/test/indices.stats/10_index.yaml
+++ b/rest-api-spec/test/indices.stats/10_index.yaml
@@ -1,33 +1,33 @@
 ---
-  setup:
-    - do:
-        indices.create:
-            index: test1
-            body:
-                settings:
-                    number_of_shards: 5
-                    number_of_replicas: 1
+setup:
+  - do:
+      indices.create:
+          index: test1
+          body:
+              settings:
+                  number_of_shards: 5
+                  number_of_replicas: 1
 
-    - do:
-        indices.create:
-            index: test2
-            body:
-                settings:
-                    number_of_shards: 4
-                    number_of_replicas: 1
-    - do:
-        index:
-            index: test1
-            type:  bar
-            id:    1
-            body:  { "foo": "bar" }
+  - do:
+      indices.create:
+          index: test2
+          body:
+              settings:
+                  number_of_shards: 4
+                  number_of_replicas: 1
+  - do:
+      index:
+          index: test1
+          type:  bar
+          id:    1
+          body:  { "foo": "bar" }
 
-    - do:
-        index:
-            index: test2
-            type:  baz
-            id:    1
-            body:  { "foo": "baz" }
+  - do:
+      index:
+          index: test2
+          type:  baz
+          id:    1
+          body:  { "foo": "baz" }
 
 ---
 "Index - blank":
diff --git a/rest-api-spec/test/indices.stats/11_metric.yaml b/rest-api-spec/test/indices.stats/11_metric.yaml
index 562d8f5f1cd..3625bb626b1 100644
--- a/rest-api-spec/test/indices.stats/11_metric.yaml
+++ b/rest-api-spec/test/indices.stats/11_metric.yaml
@@ -1,19 +1,19 @@
 ---
-  setup:
+setup:
 
-    - do:
-        index:
-            index: test1
-            type:  bar
-            id:    1
-            body:  { "foo": "bar" }
+  - do:
+      index:
+          index: test1
+          type:  bar
+          id:    1
+          body:  { "foo": "bar" }
 
-    - do:
-        index:
-            index: test2
-            type:  baz
-            id:    1
-            body:  { "foo": "baz" }
+  - do:
+      index:
+          index: test2
+          type:  baz
+          id:    1
+          body:  { "foo": "baz" }
 
 ---
 "Metric - blank":
diff --git a/rest-api-spec/test/indices.stats/12_level.yaml b/rest-api-spec/test/indices.stats/12_level.yaml
index a5820f7f2a8..d517e483d58 100644
--- a/rest-api-spec/test/indices.stats/12_level.yaml
+++ b/rest-api-spec/test/indices.stats/12_level.yaml
@@ -1,19 +1,19 @@
 ---
-  setup:
+setup:
 
-    - do:
-        index:
-            index: test1
-            type:  bar
-            id:    1
-            body:  { "foo": "bar" }
+  - do:
+      index:
+          index: test1
+          type:  bar
+          id:    1
+          body:  { "foo": "bar" }
 
-    - do:
-        index:
-            index: test2
-            type:  baz
-            id:    1
-            body:  { "foo": "baz" }
+  - do:
+      index:
+          index: test2
+          type:  baz
+          id:    1
+          body:  { "foo": "baz" }
 
 ---
 "Level - blank":
diff --git a/rest-api-spec/test/indices.stats/13_fields.yaml b/rest-api-spec/test/indices.stats/13_fields.yaml
index 4b34bdd0821..e9af0033677 100644
--- a/rest-api-spec/test/indices.stats/13_fields.yaml
+++ b/rest-api-spec/test/indices.stats/13_fields.yaml
@@ -1,43 +1,43 @@
 ---
-  setup:
+setup:
 
-    - do:
-        indices.create:
-            index:  test1
-            body:
-                mappings:
-                    bar:
-                        properties:
-                            bar:
-                                type: string
-                                fields:
-                                    completion:
-                                        type: completion
-                            baz:
-                                type: string
-                                fields:
-                                    completion:
-                                        type: completion
-    - do:
-        index:
-            index: test1
-            type:  bar
-            id:    1
-            body:  { "bar": "bar", "baz": "baz" }
+  - do:
+      indices.create:
+          index:  test1
+          body:
+              mappings:
+                  bar:
+                      properties:
+                          bar:
+                              type: string
+                              fields:
+                                  completion:
+                                      type: completion
+                          baz:
+                              type: string
+                              fields:
+                                  completion:
+                                      type: completion
+  - do:
+      index:
+          index: test1
+          type:  bar
+          id:    1
+          body:  { "bar": "bar", "baz": "baz" }
 
-    - do:
-        index:
-            index: test2
-            type:  baz
-            id:    1
-            body:  { "bar": "bar", "baz": "baz" }
+  - do:
+      index:
+          index: test2
+          type:  baz
+          id:    1
+          body:  { "bar": "bar", "baz": "baz" }
 
-    - do:
-        indices.refresh: {}
+  - do:
+      indices.refresh: {}
 
-    - do:
-        search:
-            sort: bar,baz
+  - do:
+      search:
+          sort: bar,baz
 
 ---
 "Fields - blank":
diff --git a/rest-api-spec/test/indices.stats/14_groups.yaml b/rest-api-spec/test/indices.stats/14_groups.yaml
index 9d0cab44d35..0ac1409c659 100644
--- a/rest-api-spec/test/indices.stats/14_groups.yaml
+++ b/rest-api-spec/test/indices.stats/14_groups.yaml
@@ -1,17 +1,17 @@
 ---
-  setup:
+setup:
 
-    - do:
-        index:
-            index: test1
-            type:  bar
-            id:    1
-            body:  { "bar": "bar", "baz": "baz" }
+  - do:
+      index:
+          index: test1
+          type:  bar
+          id:    1
+          body:  { "bar": "bar", "baz": "baz" }
 
-    - do:
-        search:
-            body:
-                stats:  [ bar, baz ]
+  - do:
+      search:
+          body:
+              stats:  [ bar, baz ]
 
 ---
 "Groups - blank":
diff --git a/rest-api-spec/test/indices.stats/15_types.yaml b/rest-api-spec/test/indices.stats/15_types.yaml
index 5504df434f8..9d18c945c14 100644
--- a/rest-api-spec/test/indices.stats/15_types.yaml
+++ b/rest-api-spec/test/indices.stats/15_types.yaml
@@ -1,19 +1,19 @@
 ---
-  setup:
+setup:
 
-    - do:
-        index:
-            index: test1
-            type:  bar
-            id:    1
-            body:  { "bar": "bar", "baz": "baz" }
+  - do:
+      index:
+          index: test1
+          type:  bar
+          id:    1
+          body:  { "bar": "bar", "baz": "baz" }
 
-    - do:
-        index:
-            index: test2
-            type:  baz
-            id:    1
-            body:  { "bar": "bar", "baz": "baz" }
+  - do:
+      index:
+          index: test2
+          type:  baz
+          id:    1
+          body:  { "bar": "bar", "baz": "baz" }
 
 
 ---