diff --git a/dev-tools/ci b/dev-tools/ci
index 8513791c874..ff3b733aaf5 100755
--- a/dev-tools/ci
+++ b/dev-tools/ci
@@ -53,9 +53,11 @@ case $key in
             "-psql"
             "check"
             ":x-pack-elasticsearch:plugin:precommit"
+            ":x-pack-elasticsearch:qa:sql-no-security:check"
             ":x-pack-elasticsearch:qa:sql-security:check"
             "-xforbiddenPatterns"
             "-x:x-pack-elasticsearch:plugin:forbiddenPatterns"
+            "-x:x-pack-elasticsearch:qa:sql-no-security:forbiddenPatterns"
             "-x:x-pack-elasticsearch:qa:sql-security:forbiddenPatterns"
         )
         ;;
diff --git a/qa/sql-no-security/build.gradle b/qa/sql-no-security/build.gradle
new file mode 100644
index 00000000000..c180eb1b299
--- /dev/null
+++ b/qa/sql-no-security/build.gradle
@@ -0,0 +1,28 @@
+import org.elasticsearch.gradle.test.RunTask
+
+apply plugin: 'elasticsearch.standalone-rest-test'
+apply plugin: 'elasticsearch.rest-test'
+
+integTestCluster {
+  distribution = 'zip' // NOCOMMIT make double sure we want all the modules
+  plugin project(':x-pack-elasticsearch:plugin').path
+  /* Get a "clean" test without the other x-pack features here and check them
+   * all together later on. */
+  setting 'xpack.security.enabled', 'false'
+  setting 'xpack.monitoring.enabled', 'false'
+  setting 'xpack.ml.enabled', 'false'
+  setting 'xpack.watcher.enabled', 'false'
+  setting 'script.max_compilations_per_minute', '1000'
+}
+
+task run(type: RunTask) {
+  distribution = 'zip' // NOCOMMIT make double sure we want all the modules
+  plugin project(':x-pack-elasticsearch:plugin').path
+  /* Get a "clean" test without the other x-pack features here and check them
+   * all together later on. */
+  setting 'xpack.security.enabled', 'false'
+  setting 'xpack.monitoring.enabled', 'false'
+  setting 'xpack.ml.enabled', 'false'
+  setting 'xpack.watcher.enabled', 'false'
+  setting 'script.max_compilations_per_minute', '1000'
+}
diff --git a/sql/server/src/test/java/org/elasticsearch/xpack/sql/server/RestSqlIT.java b/qa/sql-no-security/src/test/java/org/elasticsearch/xpack/sql/RestSqlIT.java
similarity index 99%
rename from sql/server/src/test/java/org/elasticsearch/xpack/sql/server/RestSqlIT.java
rename to qa/sql-no-security/src/test/java/org/elasticsearch/xpack/sql/RestSqlIT.java
index 535e8d8f3f8..d5d0f452344 100644
--- a/sql/server/src/test/java/org/elasticsearch/xpack/sql/server/RestSqlIT.java
+++ b/qa/sql-no-security/src/test/java/org/elasticsearch/xpack/sql/RestSqlIT.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.sql.server;
+package org.elasticsearch.xpack.sql;
 
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseException;
diff --git a/sql/server/build.gradle b/sql/server/build.gradle
index d4cdb01e809..1e660e8eabf 100644
--- a/sql/server/build.gradle
+++ b/sql/server/build.gradle
@@ -26,38 +26,6 @@ dependencyLicenses {
 compileJava.options.compilerArgs << "-parameters"
 compileTestJava.options.compilerArgs << "-parameters"
 
-// Configure integration tests
-apply plugin: 'elasticsearch.rest-test'
-integTest.mustRunAfter test
-gradle.projectsEvaluated {
-  // Hack to remove a dependency cycle
-  project(':x-pack-elasticsearch:plugin').test.mustRunAfter.getDependencies(project(':x-pack-elasticsearch:plugin').test).remove(test)
-}
-
-integTestCluster {
-  distribution = 'zip' // NOCOMMIT make double sure we want all the modules
-  plugin project(':x-pack-elasticsearch:plugin').path
-  /* Get a "clean" test without the other x-pack features here and check them
-   * all together later on. */
-  setting 'xpack.security.enabled', 'false'
-  setting 'xpack.monitoring.enabled', 'false'
-  setting 'xpack.ml.enabled', 'false'
-  setting 'xpack.watcher.enabled', 'false'
-  setting 'script.max_compilations_per_minute', '1000'
-}
-
-task run(type: RunTask) {
-  distribution = 'zip' // NOCOMMIT make double sure we want all the modules
-  plugin project(':x-pack-elasticsearch:plugin').path
-  /* Get a "clean" test without the other x-pack features here and check them
-   * all together later on. */
-  setting 'xpack.security.enabled', 'false'
-  setting 'xpack.monitoring.enabled', 'false'
-  setting 'xpack.ml.enabled', 'false'
-  setting 'xpack.watcher.enabled', 'false'
-  setting 'script.max_compilations_per_minute', '1000'
-}
-
 /**********************************************
  *          SQL Parser regeneration           *
  **********************************************/