diff --git a/elasticsearch/build.gradle b/elasticsearch/build.gradle
index 8e19e46e2e6..da710bc820d 100644
--- a/elasticsearch/build.gradle
+++ b/elasticsearch/build.gradle
@@ -20,19 +20,6 @@ dependencies {
     testCompile group: 'org.ini4j', name: 'ini4j', version:"${ini4jVersion}"
 }
 
-test {
-    exclude '**/*NoBootstrapTests.class'
-}
-
-task noBootstrapTest(type: Test,
-        dependsOn: test.dependsOn) {
-    classpath = project.test.classpath
-    testClassesDir = project.test.testClassesDir
-    include '**/*NoBootstrapTests.class'
-}
-check.dependsOn noBootstrapTest
-noBootstrapTest.mustRunAfter test
-
 integTest {
     cluster {
         //setting 'useNativeProcess', 'true'
@@ -40,8 +27,6 @@ integTest {
     }
 }
 
-integTest.mustRunAfter noBootstrapTest
-
 bundlePlugin {
   if (project.cppLocalDists) {
     def localCppBundles = fileTree(dir: cppLocalDists).matching { include "ml-cpp-${project.version}-*.zip" }
diff --git a/qa/no-bootstrap-tests/build.gradle b/qa/no-bootstrap-tests/build.gradle
new file mode 100644
index 00000000000..517c30ef996
--- /dev/null
+++ b/qa/no-bootstrap-tests/build.gradle
@@ -0,0 +1,6 @@
+apply plugin: 'elasticsearch.standalone-test'
+
+dependencies {
+    testCompile project(path: ':prelert-legacy:elasticsearch', configuration: 'runtime')
+}
+
diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java b/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java
similarity index 100%
rename from elasticsearch/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java
rename to qa/no-bootstrap-tests/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java