diff --git a/qa/shield-audit-tests/build.gradle b/qa/shield-audit-tests/build.gradle
new file mode 100644
index 00000000000..9ebb5cc83c9
--- /dev/null
+++ b/qa/shield-audit-tests/build.gradle
@@ -0,0 +1,28 @@
+apply plugin: 'elasticsearch.rest-test'
+
+dependencies {
+  testCompile project(path: ':x-plugins:shield', configuration: 'runtime')
+}
+
+integTest {
+  cluster {
+    plugin 'license', project(':x-plugins:license:plugin')
+    plugin 'shield', project(':x-plugins:shield')
+    // TODO: these should be settings?
+    systemProperty 'es.shield.audit.enabled', 'true'
+    systemProperty 'es.shield.audit.outputs', 'index'
+    setupCommand 'setupDummyUser',
+                 'bin/shield/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin'
+    waitCondition = { node, ant ->
+      File tmpFile = new File(node.cwd, 'wait.success')
+      ant.get(src: "http://localhost:${node.httpPort()}",
+              dest: tmpFile.toString(),
+              username: 'test_user',
+              password: 'changeme',
+              ignoreerrors: true,
+              retries: 10)
+      return tmpFile.exists()
+    }
+  }
+}
+
diff --git a/qa/shield-audit-tests/integration-tests.xml b/qa/shield-audit-tests/integration-tests.xml
deleted file mode 100644
index 24ee45c2cdc..00000000000
--- a/qa/shield-audit-tests/integration-tests.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ ELASTICSEARCH CONFIDENTIAL
-  ~ __________________
-  ~
-  ~  [2014] Elasticsearch Incorporated. All Rights Reserved.
-  ~
-  ~ NOTICE:  All information contained herein is, and remains
-  ~ the property of Elasticsearch Incorporated and its suppliers,
-  ~ if any.  The intellectual and technical concepts contained
-  ~ herein are proprietary to Elasticsearch Incorporated
-  ~ and its suppliers and may be covered by U.S. and Foreign Patents,
-  ~ patents in process, and are protected by trade secret or copyright law.
-  ~ Dissemination of this information or reproduction of this material
-  ~ is strictly forbidden unless prior written permission is obtained
-  ~ from Elasticsearch Incorporated.
-  -->
-
-<project name="shield-client-tests"
-         xmlns:ac="antlib:net.sf.antcontrib">
-
-    <import file="${elasticsearch.integ.antfile.default}"/>
-
-    <!-- redefined to work with auth -->
-    <macrodef name="waitfor-elasticsearch">
-        <attribute name="port"/>
-        <attribute name="timeoutproperty"/>
-        <sequential>
-            <echo>Waiting for elasticsearch to become available on port @{port}...</echo>
-            <waitfor maxwait="30" maxwaitunit="second"
-                     checkevery="500" checkeveryunit="millisecond"
-                     timeoutproperty="@{timeoutproperty}">
-                <socket server="127.0.0.1" port="@{port}"/>
-            </waitfor>
-        </sequential>
-    </macrodef>
-
-    <target name="start-external-cluster-with-plugin" depends="setup-workspace">
-        <ac:for list="${xplugins.list}" param="xplugin.name">
-            <sequential>
-                <fail message="Expected @{xplugin.name}-${version}.zip as a dependency, but could not be found in ${integ.deps}/plugins}">
-                    <condition>
-                        <not>
-                            <available file="${integ.deps}/plugins/@{xplugin.name}-${elasticsearch.version}.zip" />
-                        </not>
-                    </condition>
-                </fail>
-            </sequential>
-        </ac:for>
-
-        <ac:for param="file">
-            <path>
-                <fileset dir="${integ.deps}/plugins"/>
-            </path>
-            <sequential>
-                <local name="plugin.name"/>
-                <convert-plugin-name file="@{file}" outputproperty="plugin.name"/>
-                <install-plugin name="${plugin.name}" file="@{file}"/>
-            </sequential>
-        </ac:for>
-
-        <local name="home"/>
-        <property name="home" location="${integ.scratch}/elasticsearch-${elasticsearch.version}"/>
-
-        <echo>Adding shield users...</echo>
-        <run-script script="${home}/bin/shield/esusers">
-            <nested>
-                <arg value="useradd"/>
-                <arg value="test_user"/>
-                <arg value="-p"/>
-                <arg value="changeme"/>
-                <arg value="-r"/>
-                <arg value="admin"/>
-            </nested>
-        </run-script>
-
-        <startup-elasticsearch>
-            <additional-args>
-                <arg value="-Des.shield.audit.enabled=true"/>
-                <arg value="-Des.shield.audit.outputs=index"/>
-            </additional-args>
-        </startup-elasticsearch>
-
-        <echo>Checking we can connect with basic auth on port ${integ.http.port}...</echo>
-        <local name="temp.file"/>
-        <tempfile property="temp.file" destdir="${java.io.tmpdir}"/>
-        <get src="http://127.0.0.1:${integ.http.port}" dest="${temp.file}"
-             username="test_user" password="changeme" verbose="true" retries="10"/>
-    </target>
-</project>