diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3102.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3102.yml
index 6a556cb52d7..ffd8d5510f1 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3102.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3102.yml
@@ -32,8 +32,6 @@ setup:
         body:
           query: 'source=test | head 1 from 1 '
   - match: {"total": 1}
-  - match: {"schema": [{"name": "id", "type": "bigint"}]}
-  - match: {"datarows": [[2]]}
 
   - do:
       allowed_warnings:
@@ -44,5 +42,3 @@ setup:
         body:
           query: 'source=test | head 2 | head 1 from 1 '
   - match: { "total": 1 }
-  - match: { "schema": [ { "name": "id", "type": "bigint" } ] }
-  - match: { "datarows": [ [ 2 ] ] }
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3570.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3570.yml
index 3176817123c..94b08b12328 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3570.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3570.yml
@@ -43,7 +43,10 @@ teardown:
   - skip:
       features:
         - headers
+        - allowed_warnings
   - do:
+      allowed_warnings:
+        - 'Loading the fielddata on the _id field is deprecated and will be removed in future versions. If you require sorting or aggregating on this field you should also include the id in the body of your documents, and map this field as a keyword field that has [doc_values] enabled'
       headers:
         Content-Type: 'application/json'
       ppl:
@@ -65,7 +68,10 @@ teardown:
   - skip:
       features:
         - headers
+        - allowed_warnings
   - do:
+      allowed_warnings:
+        - 'Loading the fielddata on the _id field is deprecated and will be removed in future versions. If you require sorting or aggregating on this field you should also include the id in the body of your documents, and map this field as a keyword field that has [doc_values] enabled'
       headers:
         Content-Type: 'application/json'
       ppl:
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3881.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3881.yml
index d9ced656493..b639b84a7ef 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3881.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3881.yml
@@ -40,10 +40,10 @@ teardown:
         Content-Type: 'application/json'
       ppl:
         body:
-          query: 'source=test | where a = 1 or a = 2 or isNull(a)'
+          query: 'source=test | where a = 1 or a = 2 or isNull(a) | sort a'
   - match: {"total": 3}
   - match: {"schema": [{"name": "a", "type": "bigint"}]}
-  - match: {"datarows": [[1], [2], [null]]}
+  - match: {"datarows": [[null], [1], [2]]}
 
   - do:
       allowed_warnings:
@@ -52,7 +52,7 @@ teardown:
         Content-Type: 'application/json'
       ppl:
         body:
-          query: 'source=test | where (a = 1 or a = 2) and isNotNull(a)'
+          query: 'source=test | where (a = 1 or a = 2) and isNotNull(a) | sort a'
   - match: { "total": 2 }
   - match: { "schema": [ { "name": "a", "type": "bigint" } ] }
   - match: {"datarows": [[1], [2]]}