diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java
index b7d26d927fbd3..e7df3e1c22d50 100644
--- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java
+++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java
@@ -915,7 +915,11 @@ public void testApiNamingConventions() throws Exception {
                                 apiName.startsWith("async_search") == false &&
                                 // IndicesClientIT.getIndexTemplate should be renamed "getTemplate" in version 8.0 when we
                                 // can get rid of 7.0's deprecated "getTemplate"
-                                apiName.equals("indices.get_index_template") == false) {
+                                apiName.equals("indices.get_index_template") == false &&
+                                org.elasticsearch.common.collect.List.of("indices.data_streams_stats",
+                                    "indices.delete_data_stream",
+                                    "indices.create_data_stream",
+                                    "indices.get_data_stream").contains(apiName) == false) {
                                 apiNotFound.add(apiName);
                             }
                         }
diff --git a/x-pack/plugin/data-streams/qa/rest/build.gradle b/x-pack/plugin/data-streams/qa/rest/build.gradle
index 70ac9548ae42d..0144dfcbc4a23 100644
--- a/x-pack/plugin/data-streams/qa/rest/build.gradle
+++ b/x-pack/plugin/data-streams/qa/rest/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'elasticsearch.rest-resources'
 restResources {
   restApi {
     includeCore 'bulk', 'count', 'search', '_common', 'indices', 'index', 'cluster', 'rank_eval', 'reindex', 'update_by_query', 'delete_by_query'
-    includeXpack 'enrich'
+    includeXpack 'indices'
   }
 }
 
diff --git a/x-pack/plugin/eql/qa/rest/build.gradle b/x-pack/plugin/eql/qa/rest/build.gradle
index d790b6722ff34..c89447234ebbb 100644
--- a/x-pack/plugin/eql/qa/rest/build.gradle
+++ b/x-pack/plugin/eql/qa/rest/build.gradle
@@ -8,7 +8,7 @@ apply plugin: 'elasticsearch.rest-resources'
 restResources {
   restApi {
     includeCore '_common', 'bulk', 'indices'
-    includeXpack 'eql'
+    includeXpack 'eql', 'indices'
   }
 }
 
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create_data_stream.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/indices.create_data_stream.json
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/api/indices.create_data_stream.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/indices.create_data_stream.json
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.data_streams_stats.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/indices.data_streams_stats.json
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/api/indices.data_streams_stats.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/indices.data_streams_stats.json
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_stream.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/indices.delete_data_stream.json
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_data_stream.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/indices.delete_data_stream.json
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/indices.get_data_stream.json
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/api/indices.get_data_stream.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/indices.get_data_stream.json
diff --git a/x-pack/plugin/stack/qa/rest/build.gradle b/x-pack/plugin/stack/qa/rest/build.gradle
index 885e9fce670bf..f4d5f4dc8a182 100644
--- a/x-pack/plugin/stack/qa/rest/build.gradle
+++ b/x-pack/plugin/stack/qa/rest/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 restResources {
   restApi {
     includeCore '_common', 'cluster', 'indices', 'index', 'snapshot'
-    includeXpack 'ilm', 'slm', 'stack'
+    includeXpack 'ilm', 'slm', 'stack', 'indices'
   }
 }
 
diff --git a/x-pack/qa/multi-cluster-search-security/build.gradle b/x-pack/qa/multi-cluster-search-security/build.gradle
index 6ff3b96851451..85141164c8fa1 100644
--- a/x-pack/qa/multi-cluster-search-security/build.gradle
+++ b/x-pack/qa/multi-cluster-search-security/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 
 restResources {
   restApi {
-    includeXpack 'security', 'async_search'
+    includeXpack 'security', 'async_search', 'indices'
   }
 }