diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml
index d07e06865a1..fca70a57697 100644
--- a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml
+++ b/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml
@@ -25,7 +25,7 @@
           mappings:
             doc:
               properties:
-                body:
+                text:
                   type: text
                   analyzer: index
                   search_analyzer: search
@@ -43,9 +43,10 @@
         body:
           query:
             match:
-              text: fox runs
-              operator: AND
-  - match: {hits.count: 1}
+              text:
+                query: fox runs
+                operator: AND
+  - match: {hits.total: 1}
 
   - do:
       index:
@@ -60,6 +61,7 @@
         body:
           query:
             match:
-              text: fox runs
-              operator: AND
-  - match: {hits.count: 2}
+              text:
+                query: fox runs
+                operator: AND
+  - match: {hits.total: 2}
diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/termvectors/10_payloads.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/termvectors/10_payloads.yml
index d0e31758340..489b55a63cd 100644
--- a/modules/analysis-common/src/test/resources/rest-api-spec/test/termvectors/10_payloads.yml
+++ b/modules/analysis-common/src/test/resources/rest-api-spec/test/termvectors/10_payloads.yml
@@ -3,23 +3,23 @@
   # because there are no token filters that support payloads in core.
   - do:
       indices.create:
-          index: test
-          body:
-            mappings:
-              doc:
-                properties:
-                  text:
-                    type: text
-                    term_vector: with_positions_offsets_payloads
-                    analyzer: has_payloads
-              settings:
-                number_of_shards: 1
-                number_of_replicas: 1
-                analysis:
-                  analyzer:
-                    had_payloads:
-                      tokenizer: standard
-                      filter: [type_as_payload]
+        index: test
+        body:
+          settings:
+            number_of_shards: 1
+            number_of_replicas: 1
+            analysis:
+              analyzer:
+                has_payloads:
+                  tokenizer: standard
+                  filter: [type_as_payload]
+          mappings:
+            doc:
+              properties:
+                text:
+                  type: text
+                  term_vector: with_positions_offsets_payloads
+                  analyzer: has_payloads
 
   - do:
       index:
@@ -37,4 +37,4 @@
         id:    1
         payloads: true
   - match: {term_vectors.text.field_statistics.sum_doc_freq: 5}
-  - match: {term_vectors.text.terms.brown.tokens.0.payload: 10}
+  - match: {term_vectors.text.terms.brown.tokens.0.payload: PEFMUEhBTlVNPg==}