diff --git a/java/ql/src/experimental/Security/CWE/CWE-927/SensitiveBroadcast.java b/java/ql/src/Security/CWE/CWE-927/SensitiveBroadcast.java
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-927/SensitiveBroadcast.java
rename to java/ql/src/Security/CWE/CWE-927/SensitiveBroadcast.java
diff --git a/java/ql/src/experimental/Security/CWE/CWE-927/SensitiveBroadcast.qhelp b/java/ql/src/Security/CWE/CWE-927/SensitiveBroadcast.qhelp
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-927/SensitiveBroadcast.qhelp
rename to java/ql/src/Security/CWE/CWE-927/SensitiveBroadcast.qhelp
diff --git a/java/ql/src/experimental/Security/CWE/CWE-927/SensitiveBroadcast.ql b/java/ql/src/Security/CWE/CWE-927/SensitiveBroadcast.ql
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-927/SensitiveBroadcast.ql
rename to java/ql/src/Security/CWE/CWE-927/SensitiveBroadcast.ql
diff --git a/java/ql/test/experimental/query-tests/security/CWE-927/SensitiveBroadcast.qlref b/java/ql/test/experimental/query-tests/security/CWE-927/SensitiveBroadcast.qlref
deleted file mode 100644
index 20c5250d80d..00000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-927/SensitiveBroadcast.qlref
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security/CWE/CWE-927/SensitiveBroadcast.ql
diff --git a/java/ql/test/experimental/query-tests/security/CWE-927/SensitiveBroadcast.expected b/java/ql/test/query-tests/security/CWE-927/SensitiveBroadcast.expected
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-927/SensitiveBroadcast.expected
rename to java/ql/test/query-tests/security/CWE-927/SensitiveBroadcast.expected
diff --git a/java/ql/test/experimental/query-tests/security/CWE-927/SensitiveBroadcast.java b/java/ql/test/query-tests/security/CWE-927/SensitiveBroadcast.java
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-927/SensitiveBroadcast.java
rename to java/ql/test/query-tests/security/CWE-927/SensitiveBroadcast.java
diff --git a/java/ql/test/query-tests/security/CWE-927/SensitiveBroadcast.qlref b/java/ql/test/query-tests/security/CWE-927/SensitiveBroadcast.qlref
new file mode 100644
index 00000000000..1d168783ae0
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-927/SensitiveBroadcast.qlref
@@ -0,0 +1 @@
+Security/CWE/CWE-927/SensitiveBroadcast.ql
diff --git a/java/ql/test/experimental/query-tests/security/CWE-927/options b/java/ql/test/query-tests/security/CWE-927/options
similarity index 66%
rename from java/ql/test/experimental/query-tests/security/CWE-927/options
rename to java/ql/test/query-tests/security/CWE-927/options
index 43e25f608b6..f017f81ff2f 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-927/options
+++ b/java/ql/test/query-tests/security/CWE-927/options
@@ -1 +1 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/google-android-9.0.0
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/google-android-9.0.0