diff --git a/marvel/build.gradle b/marvel/build.gradle
index df4f9675ed1..2abc375e372 100644
--- a/marvel/build.gradle
+++ b/marvel/build.gradle
@@ -35,7 +35,7 @@ compileTestJava.options.compilerArgs << '-Xlint:-rawtypes,-unchecked'
 
 ext.expansions = [
   'project.version': version,
-  'integ.http.port': integTest.cluster.httpPort
+  'integ.http.port': integTest.cluster.baseHttpPort
 ]
 
 processResources {
diff --git a/qa/build.gradle b/qa/build.gradle
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/shield-core-rest-tests/build.gradle b/qa/shield-core-rest-tests/build.gradle
new file mode 100644
index 00000000000..926d18bb2a1
--- /dev/null
+++ b/qa/shield-core-rest-tests/build.gradle
@@ -0,0 +1,57 @@
+apply plugin: 'elasticsearch.rest-test'
+
+configurations {
+  licensePluginZip
+  shieldPluginZip
+}
+
+dependencies {
+  licensePluginZip project(path: ':x-plugins:license:plugin')
+  shieldPluginZip project(path: ':x-plugins:shield')
+  testCompile project(path: ':x-plugins:shield', configuration: 'runtime')
+}
+
+integTest {
+  dependsOn configurations.licensePluginZip, configurations.shieldPluginZip
+  includePackaged true
+  systemProperty 'tests.rest.blacklist', 
+    ['indices.get/10_basic/*allow_no_indices*',
+     'cat.count/10_basic/Test cat count output',
+     'cat.aliases/10_basic/Empty cluster',
+     'indices.segments/10_basic/no segments test',
+     'indices.clear_cache/10_basic/clear_cache test',
+     'indices.status/10_basic/Indices status test',
+     'cat.indices/10_basic/Test cat indices output',
+     'cat.recovery/10_basic/Test cat recovery output',
+     'cat.shards/10_basic/Test cat shards output',
+     'termvector/20_issue7121/*',
+     'index/10_with_id/Index with ID',
+     'indices.get_alias/20_emtpy/*',
+     'cat.segments/10_basic/Test cat segments output',
+     'indices.put_settings/10_basic/Test indices settings allow_no_indices',
+     'indices.put_settings/10_basic/Test indices settings ignore_unavailable',
+     'indices.refresh/10_basic/Indices refresh test no-match wildcard',
+     'indices.stats/10_index/Index - star*',
+     'indices.recovery/10_basic/Indices recovery test*',
+     'indices.shard_stores/10_basic/no indices test',
+     'cat.nodeattrs/10_basic/Test cat nodes attrs output',
+     'bulk/40_fields/Fields'].join(',')
+
+  cluster {
+    plugin 'license', configurations.licensePluginZip
+    plugin 'shield', configurations.shieldPluginZip
+    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-core-rest-tests/integration-tests.xml b/qa/shield-core-rest-tests/integration-tests.xml
deleted file mode 100644
index 4da32222a8f..00000000000
--- a/qa/shield-core-rest-tests/integration-tests.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<project name="smoke-test-x-plugins"
-         xmlns:ac="antlib:net.sf.antcontrib">
-
-  <import file="${elasticsearch.integ.antfile.default}"/>
-  <import file="${elasticsearch.tools.directory}/ant/shield-overrides.xml"/>
-
-</project>
diff --git a/shield/src/main/java/org/elasticsearch/shield/ShieldPlugin.java b/shield/src/main/java/org/elasticsearch/shield/ShieldPlugin.java
index 8d267678831..095b971ccd1 100644
--- a/shield/src/main/java/org/elasticsearch/shield/ShieldPlugin.java
+++ b/shield/src/main/java/org/elasticsearch/shield/ShieldPlugin.java
@@ -182,7 +182,7 @@ public class ShieldPlugin extends Plugin {
     @Override
     public void onIndexService(IndexService indexService) {
         if (enabled && clientMode == false) {
-            failIfShieldQueryCacheIsNotActive(settings, false);
+            failIfShieldQueryCacheIsNotActive(indexService.getIndexSettings().getSettings(), false);
         }
     }