diff --git a/x-pack/plugin/repository-encrypted/build.gradle b/x-pack/plugin/repository-encrypted/build.gradle
index 71c8acf335e31..ec8fe14087eda 100644
--- a/x-pack/plugin/repository-encrypted/build.gradle
+++ b/x-pack/plugin/repository-encrypted/build.gradle
@@ -2,6 +2,7 @@ evaluationDependsOn(xpackModule('core'))
 
 apply plugin: 'elasticsearch.internal-es-plugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'elasticsearch.internal-test-artifact'
 esplugin {
     name 'repository-encrypted'
     description 'Elasticsearch Expanded Pack Plugin - client-side encrypted repositories.'
@@ -14,18 +15,4 @@ dependencies {
     // necessary for the license check
     compileOnly project(path: xpackModule('core'))
     testImplementation(testArtifact(project(xpackModule('core'))))
-
-    // required for integ tests of encrypted FS repository
-    internalClusterTestImplementation project(":test:framework")
-    // required for integ tests of encrypted cloud repositories
-    internalClusterTestImplementation testArtifact(project(':plugins:repository-gcs'), 'internalClusterTest')
-    internalClusterTestImplementation testArtifact(project(':plugins:repository-azure'), 'internalClusterTest')
-    internalClusterTestImplementation(testArtifact(project(':plugins:repository-s3'), 'internalClusterTest')) {
-        // HACK, resolves jar hell, such as:
-        // jar1: jakarta.xml.bind/jakarta.xml.bind-api/2.3.2/8d49996a4338670764d7ca4b85a1c4ccf7fe665d/jakarta.xml.bind-api-2.3.2.jar
-        // jar2: javax.xml.bind/jaxb-api/2.2.2/aeb3021ca93dde265796d82015beecdcff95bf09/jaxb-api-2.2.2.jar
-        exclude group: 'javax.xml.bind', module: 'jaxb-api'
-    }
-    // for encrypted GCS repository integ tests
-    internalClusterTestRuntimeOnly 'com.google.guava:guava:26.0-jre'
 }
diff --git a/x-pack/plugin/repository-encrypted/qa/azure/build.gradle b/x-pack/plugin/repository-encrypted/qa/azure/build.gradle
new file mode 100644
index 0000000000000..aabe7e1b0c6b4
--- /dev/null
+++ b/x-pack/plugin/repository-encrypted/qa/azure/build.gradle
@@ -0,0 +1,8 @@
+
+apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'elasticsearch.java'
+
+dependencies {
+    internalClusterTestImplementation testArtifact(project(':plugins:repository-azure'), 'internalClusterTest')
+    internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
+}
diff --git a/x-pack/plugin/repository-encrypted/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedAzureBlobStoreRepositoryIntegTests.java b/x-pack/plugin/repository-encrypted/qa/azure/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedAzureBlobStoreRepositoryIntegTests.java
similarity index 100%
rename from x-pack/plugin/repository-encrypted/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedAzureBlobStoreRepositoryIntegTests.java
rename to x-pack/plugin/repository-encrypted/qa/azure/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedAzureBlobStoreRepositoryIntegTests.java
diff --git a/x-pack/plugin/repository-encrypted/qa/build.gradle b/x-pack/plugin/repository-encrypted/qa/build.gradle
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/x-pack/plugin/repository-encrypted/qa/gcs/build.gradle b/x-pack/plugin/repository-encrypted/qa/gcs/build.gradle
new file mode 100644
index 0000000000000..bd4f05b065f35
--- /dev/null
+++ b/x-pack/plugin/repository-encrypted/qa/gcs/build.gradle
@@ -0,0 +1,8 @@
+
+apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'elasticsearch.java'
+
+dependencies {
+    internalClusterTestImplementation testArtifact(project(':plugins:repository-gcs'), 'internalClusterTest')
+    internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
+}
diff --git a/x-pack/plugin/repository-encrypted/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedGCSBlobStoreRepositoryIntegTests.java b/x-pack/plugin/repository-encrypted/qa/gcs/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedGCSBlobStoreRepositoryIntegTests.java
similarity index 100%
rename from x-pack/plugin/repository-encrypted/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedGCSBlobStoreRepositoryIntegTests.java
rename to x-pack/plugin/repository-encrypted/qa/gcs/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedGCSBlobStoreRepositoryIntegTests.java
diff --git a/x-pack/plugin/repository-encrypted/qa/s3/build.gradle b/x-pack/plugin/repository-encrypted/qa/s3/build.gradle
new file mode 100644
index 0000000000000..fbde963e9ba0d
--- /dev/null
+++ b/x-pack/plugin/repository-encrypted/qa/s3/build.gradle
@@ -0,0 +1,8 @@
+
+apply plugin: 'elasticsearch.internal-cluster-test'
+apply plugin: 'elasticsearch.java'
+
+dependencies {
+    internalClusterTestImplementation testArtifact(project(':plugins:repository-s3'), 'internalClusterTest')
+    internalClusterTestImplementation testArtifact(project(':x-pack:plugin:repository-encrypted'), 'test')
+}
diff --git a/x-pack/plugin/repository-encrypted/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedS3BlobStoreRepositoryIntegTests.java b/x-pack/plugin/repository-encrypted/qa/s3/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedS3BlobStoreRepositoryIntegTests.java
similarity index 100%
rename from x-pack/plugin/repository-encrypted/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedS3BlobStoreRepositoryIntegTests.java
rename to x-pack/plugin/repository-encrypted/qa/s3/src/internalClusterTest/java/org/elasticsearch/repositories/encrypted/EncryptedS3BlobStoreRepositoryIntegTests.java