diff --git a/java/ql/test/query-tests/security/CWE-489/AndroidManifest.xml b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/AndroidManifest.xml
similarity index 100%
rename from java/ql/test/query-tests/security/CWE-489/AndroidManifest.xml
rename to java/ql/test/query-tests/security/CWE-489/debuggable-attribute/AndroidManifest.xml
diff --git a/java/ql/test/query-tests/security/CWE-489/DebuggableAttributeEnabledTest.expected b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.expected
similarity index 100%
rename from java/ql/test/query-tests/security/CWE-489/DebuggableAttributeEnabledTest.expected
rename to java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.expected
diff --git a/java/ql/test/query-tests/security/CWE-489/DebuggableAttributeEnabledTest.ql b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.ql
similarity index 100%
rename from java/ql/test/query-tests/security/CWE-489/DebuggableAttributeEnabledTest.ql
rename to java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.ql
diff --git a/java/ql/test/query-tests/security/CWE-489/Test.java b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/Test.java
similarity index 100%
rename from java/ql/test/query-tests/security/CWE-489/Test.java
rename to java/ql/test/query-tests/security/CWE-489/debuggable-attribute/Test.java
diff --git a/java/ql/test/query-tests/security/CWE-489/TestFalse/AndroidManifest.xml b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/TestFalse/AndroidManifest.xml
similarity index 100%
rename from java/ql/test/query-tests/security/CWE-489/TestFalse/AndroidManifest.xml
rename to java/ql/test/query-tests/security/CWE-489/debuggable-attribute/TestFalse/AndroidManifest.xml
diff --git a/java/ql/test/query-tests/security/CWE-489/TestNotSet/AndroidManifest.xml b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/TestNotSet/AndroidManifest.xml
similarity index 100%
rename from java/ql/test/query-tests/security/CWE-489/TestNotSet/AndroidManifest.xml
rename to java/ql/test/query-tests/security/CWE-489/debuggable-attribute/TestNotSet/AndroidManifest.xml
diff --git a/java/ql/test/query-tests/security/CWE-489/Testbuild/AndroidManifest.xml b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/Testbuild/AndroidManifest.xml
similarity index 100%
rename from java/ql/test/query-tests/security/CWE-489/Testbuild/AndroidManifest.xml
rename to java/ql/test/query-tests/security/CWE-489/debuggable-attribute/Testbuild/AndroidManifest.xml
diff --git a/java/ql/test/query-tests/security/CWE-489/options b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/options
similarity index 67%
rename from java/ql/test/query-tests/security/CWE-489/options
rename to java/ql/test/query-tests/security/CWE-489/debuggable-attribute/options
index dacd3cb21df..33cdc1ea940 100644
--- a/java/ql/test/query-tests/security/CWE-489/options
+++ b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/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