diff --git a/plugin/src/test/resources/rest-api-spec/test/monitoring/bulk/10_basic.yml b/plugin/src/test/resources/rest-api-spec/test/monitoring/bulk/10_basic.yml
index 510c5af749e..c5d22852692 100644
--- a/plugin/src/test/resources/rest-api-spec/test/monitoring/bulk/10_basic.yml
+++ b/plugin/src/test/resources/rest-api-spec/test/monitoring/bulk/10_basic.yml
@@ -78,7 +78,6 @@
   - do:
       search:
         index: .monitoring-data-*
-        type:  kibana
 
   - match: { hits.total: 0 }
 
@@ -122,7 +121,6 @@
   - do:
       search:
         index: .monitoring-data-*
-        type:  kibana
 
   - match: { hits.total: 0 }
 
diff --git a/plugin/src/test/resources/rest-api-spec/test/security/hidden-index/10_security_read.yml b/plugin/src/test/resources/rest-api-spec/test/security/hidden-index/10_security_read.yml
index c093a9fe945..dd81f4dc35f 100644
--- a/plugin/src/test/resources/rest-api-spec/test/security/hidden-index/10_security_read.yml
+++ b/plugin/src/test/resources/rest-api-spec/test/security/hidden-index/10_security_read.yml
@@ -74,12 +74,10 @@ teardown:
       headers: { Authorization: "Basic dGVzdF91c2VyOngtcGFjay10ZXN0LXBhc3N3b3Jk" } # test_user
       search:
         index: ".security"
-        type: "doc"
 
   - do:
       headers: { Authorization: "Basic dGVzdF91c2VyOngtcGFjay10ZXN0LXBhc3N3b3Jk" } # test_user
       search:
         index: ".secu*rity"
-        type: "doc"
   - match: { hits.total: 0 }
 
diff --git a/plugin/src/test/resources/rest-api-spec/test/security/hidden-index/11_security-6_read.yml b/plugin/src/test/resources/rest-api-spec/test/security/hidden-index/11_security-6_read.yml
index 4569987a433..8d88211d2a1 100644
--- a/plugin/src/test/resources/rest-api-spec/test/security/hidden-index/11_security-6_read.yml
+++ b/plugin/src/test/resources/rest-api-spec/test/security/hidden-index/11_security-6_read.yml
@@ -74,12 +74,10 @@ teardown:
       headers: { Authorization: "Basic dGVzdF91c2VyOngtcGFjay10ZXN0LXBhc3N3b3Jk" } # test_user
       search:
         index: ".security-6"
-        type: "doc"
 
   - do:
       headers: { Authorization: "Basic dGVzdF91c2VyOngtcGFjay10ZXN0LXBhc3N3b3Jk" } # test_user
       search:
         index: ".security*6"
-        type: "doc"
   - match: { hits.total: 0 }
 
diff --git a/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java b/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java
index 04523cb51ed..114fbdd4e5d 100644
--- a/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java
+++ b/qa/ml-native-tests/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java
@@ -228,7 +228,7 @@ public class MlJobIT extends ESRestTestCase {
         responseAsString = responseEntityToString(response);
         assertThat(responseAsString, containsString("\"count\":2"));
 
-        response = client().performRequest("get", AnomalyDetectorsIndex.jobResultsAliasedName(jobId1) + "/doc/_search");
+        response = client().performRequest("get", AnomalyDetectorsIndex.jobResultsAliasedName(jobId1) + "/_search");
         assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
         responseAsString = responseEntityToString(response);
         assertThat(responseAsString, containsString("\"total\":2"));