diff --git a/java/ql/src/experimental/Security/CWE/CWE-522/InsecureBasicAuth.java b/java/ql/src/Security/CWE/CWE-522/InsecureBasicAuth.java
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-522/InsecureBasicAuth.java
rename to java/ql/src/Security/CWE/CWE-522/InsecureBasicAuth.java
diff --git a/java/ql/src/experimental/Security/CWE/CWE-522/InsecureBasicAuth.qhelp b/java/ql/src/Security/CWE/CWE-522/InsecureBasicAuth.qhelp
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-522/InsecureBasicAuth.qhelp
rename to java/ql/src/Security/CWE/CWE-522/InsecureBasicAuth.qhelp
diff --git a/java/ql/src/experimental/Security/CWE/CWE-522/InsecureBasicAuth.ql b/java/ql/src/Security/CWE/CWE-522/InsecureBasicAuth.ql
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-522/InsecureBasicAuth.ql
rename to java/ql/src/Security/CWE/CWE-522/InsecureBasicAuth.ql
diff --git a/java/ql/test/experimental/query-tests/security/CWE-522/InsecureBasicAuth.qlref b/java/ql/test/experimental/query-tests/security/CWE-522/InsecureBasicAuth.qlref
deleted file mode 100644
index 36034122a2e..00000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-522/InsecureBasicAuth.qlref
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security/CWE/CWE-522/InsecureBasicAuth.ql
diff --git a/java/ql/test/experimental/query-tests/security/CWE-522/InsecureBasicAuth.expected b/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuth.expected
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-522/InsecureBasicAuth.expected
rename to java/ql/test/query-tests/security/CWE-522/InsecureBasicAuth.expected
diff --git a/java/ql/test/experimental/query-tests/security/CWE-522/InsecureBasicAuth.java b/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuth.java
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-522/InsecureBasicAuth.java
rename to java/ql/test/query-tests/security/CWE-522/InsecureBasicAuth.java
diff --git a/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuth.qlref b/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuth.qlref
new file mode 100644
index 00000000000..d3c297f7f71
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuth.qlref
@@ -0,0 +1 @@
+Security/CWE/CWE-522/InsecureBasicAuth.ql
diff --git a/java/ql/test/experimental/query-tests/security/CWE-522/options b/java/ql/test/query-tests/security/CWE-522/options
similarity index 68%
rename from java/ql/test/experimental/query-tests/security/CWE-522/options
rename to java/ql/test/query-tests/security/CWE-522/options
index 7eaf4cb235f..2e6054aac45 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-522/options
+++ b/java/ql/test/query-tests/security/CWE-522/options
@@ -1 +1 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/apache-http-4.4.13
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/apache-http-4.4.13