diff --git a/x-pack/plugin/graph/qa/build.gradle b/x-pack/plugin/graph/qa/build.gradle
index 35bd236df5c..25b21503bed 100644
--- a/x-pack/plugin/graph/qa/build.gradle
+++ b/x-pack/plugin/graph/qa/build.gradle
@@ -1,17 +1,17 @@
 import org.elasticsearch.gradle.test.RestIntegTestTask
 
-subprojects {
-    // HACK: please fix this
-    // we want to add the rest api specs for xpack to qa tests, but we
-    // need to wait until after the project is evaluated to only apply
-    // to those that rest tests. this used to be done automatically
-    // when xpack was a plugin, but now there is no place with xpack as a module.
-    // instead, we should package these and make them easy to use for rest tests,
-    // but currently, they must be copied into the resources of the test runner.
-    project.tasks.withType(RestIntegTestTask) {
-        File xpackResources = new File(xpackProject('plugin').projectDir, 'src/test/resources')
-        project.copyRestSpec.from(xpackResources) {
-            include 'rest-api-spec/api/**'
-        }
-    }
+subprojects {	
+    // HACK: please fix this	
+    // we want to add the rest api specs for xpack to qa tests, but we	
+    // need to wait until after the project is evaluated to only apply	
+    // to those that rest tests. this used to be done automatically	
+    // when xpack was a plugin, but now there is no place with xpack as a module.	
+    // instead, we should package these and make them easy to use for rest tests,	
+    // but currently, they must be copied into the resources of the test runner.	
+    project.tasks.withType(RestIntegTestTask) {	
+        File xpackResources = new File(xpackProject('plugin').projectDir, 'src/test/resources')	
+        project.copyRestSpec.from(xpackResources) {	
+            include 'rest-api-spec/api/**'	
+        }	
+    }	
 }
diff --git a/x-pack/plugin/graph/qa/with-security/build.gradle b/x-pack/plugin/graph/qa/with-security/build.gradle
index a79d72d0c7b..1a979d83355 100644
--- a/x-pack/plugin/graph/qa/with-security/build.gradle
+++ b/x-pack/plugin/graph/qa/with-security/build.gradle
@@ -1,3 +1,4 @@
+apply plugin: 'elasticsearch.testclusters'
 apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
 
@@ -12,25 +13,15 @@ task copyGraphRestTests(type: Copy) {
   include 'rest-api-spec/test/graph/**'
 }
 
-integTestCluster {
-  dependsOn copyGraphRestTests
-  extraConfigFile 'roles.yml', 'roles.yml'
-  setupCommand 'setupTestAdminUser',
-               'bin/elasticsearch-users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
-  setupCommand 'setupGraphExplorerUser',
-               'bin/elasticsearch-users', 'useradd', 'graph_explorer', '-p', 'x-pack-test-password', '-r', 'graph_explorer'
-  setupCommand 'setupPowerlessUser',
-               'bin/elasticsearch-users', 'useradd', 'no_graph_explorer', '-p', 'x-pack-test-password', '-r', 'no_graph_explorer'
-  setting 'xpack.license.self_generated.type', 'trial'
+integTest.dependsOn copyGraphRestTests
+
+testClusters.integTest {
+  distribution = "DEFAULT"
   setting 'xpack.security.enabled', 'true'
-  waitCondition = { node, ant ->
-    File tmpFile = new File(node.cwd, 'wait.success')
-    ant.get(src: "http://${node.httpUri()}/_cluster/health?wait_for_nodes=>=${numNodes}&wait_for_status=yellow",
-            dest: tmpFile.toString(),
-            username: 'test_admin',
-            password: 'x-pack-test-password',
-            ignoreerrors: true,
-            retries: 10)
-    return tmpFile.exists()
-  }
+  setting 'xpack.license.self_generated.type', 'trial'
+
+  extraConfigFile 'roles.yml', file('roles.yml')
+  user username: 'test_admin', password: 'x-pack-test-password'
+  user username: 'graph_explorer', password: 'x-pack-test-password', role: 'graph_explorer'
+  user username: 'no_graph_explorer', password: 'x-pack-test-password', role: 'no_graph_explorer'
 }