diff --git a/x-pack/plugin/inference/build.gradle b/x-pack/plugin/inference/build.gradle
index 7000225f14e57..781261c330e78 100644
--- a/x-pack/plugin/inference/build.gradle
+++ b/x-pack/plugin/inference/build.gradle
@@ -6,6 +6,13 @@
  */
 apply plugin: 'elasticsearch.internal-es-plugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'elasticsearch.internal-yaml-rest-test'
+
+restResources {
+  restApi {
+    include '_common', 'bulk', 'indices', 'inference', 'index', 'get', 'update', 'reindex'
+  }
+}
 
 esplugin {
   name 'x-pack-inference'
@@ -24,6 +31,9 @@ dependencies {
   compileOnly project(path: xpackModule('core'))
   testImplementation(testArtifact(project(xpackModule('core'))))
   testImplementation project(':modules:reindex')
+  clusterPlugins project(':x-pack:plugin:inference:qa:test-service-plugin')
 }
 
-addQaCheckDependencies(project)
+tasks.named('yamlRestTest') {
+  usesDefaultDistribution()
+}
diff --git a/x-pack/plugin/inference/qa/rest/build.gradle b/x-pack/plugin/inference/qa/rest/build.gradle
deleted file mode 100644
index 977a97704a4da..0000000000000
--- a/x-pack/plugin/inference/qa/rest/build.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-apply plugin: 'elasticsearch.internal-yaml-rest-test'
-
-dependencies {
-  clusterPlugins project(':x-pack:plugin:inference:qa:test-service-plugin')
-}
-
-restResources {
-  restApi {
-    include '_common', 'bulk', 'indices', 'inference', 'index', 'get', 'update', 'reindex'
-  }
-}
-
-tasks.named('yamlRestTest') {
-  usesDefaultDistribution()
-}
diff --git a/x-pack/plugin/inference/qa/rest/src/yamlRestTest/java/org/elasticsearch/xpack/inference/InferenceRestIT.java b/x-pack/plugin/inference/src/yamlRestTest/java/org/elasticsearch/xpack/inference/InferenceRestIT.java
similarity index 100%
rename from x-pack/plugin/inference/qa/rest/src/yamlRestTest/java/org/elasticsearch/xpack/inference/InferenceRestIT.java
rename to x-pack/plugin/inference/src/yamlRestTest/java/org/elasticsearch/xpack/inference/InferenceRestIT.java
diff --git a/x-pack/plugin/inference/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/inference/10_semantic_text_inference.yml b/x-pack/plugin/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/10_semantic_text_inference.yml
similarity index 100%
rename from x-pack/plugin/inference/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/inference/10_semantic_text_inference.yml
rename to x-pack/plugin/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/10_semantic_text_inference.yml