diff --git a/codeql-workspace.yml b/codeql-workspace.yml
index c2258bd1363f..2d86498cbeae 100644
--- a/codeql-workspace.yml
+++ b/codeql-workspace.yml
@@ -4,6 +4,8 @@ provide:
   - "*/ql/test/qlpack.yml"
   - "*/ql/examples/qlpack.yml"
   - "*/ql/consistency-queries/qlpack.yml"
+  - "*/ql/automodel/src/qlpack.yml"
+  - "*/ql/automodel/test/qlpack.yml"
   - "shared/*/qlpack.yml"
   - "cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml"
   - "go/ql/config/legacy-support/qlpack.yml"
diff --git a/csharp/ql/campaigns/Solorigate/publish.sh b/csharp/ql/campaigns/Solorigate/publish.sh
index 2d1dcfa3bfb1..0c57fd6c4880 100755
--- a/csharp/ql/campaigns/Solorigate/publish.sh
+++ b/csharp/ql/campaigns/Solorigate/publish.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-SOLORIGATE_ROOT="$(dirname $0)"
+SOLORIGATE_ROOT="$(readlink -f "$(dirname $0)")"
 WORKSPACE_ROOT="$SOLORIGATE_ROOT/../../../.."
 GRPS="solorigate,-test"
 
diff --git a/java/ql/automodel/publish.sh b/java/ql/automodel/publish.sh
new file mode 100755
index 000000000000..b13570c950f7
--- /dev/null
+++ b/java/ql/automodel/publish.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+set -e
+
+AUTOMODEL_ROOT="$(readlink -f "$(dirname $0)")"
+WORKSPACE_ROOT="$AUTOMODEL_ROOT/../../.."
+GRPS="automodel,-test"
+
+if [ -z "$CODEQL_DIST" ]; then
+  echo "CODEQL_DIST not set"
+  exit -1
+fi
+
+cd "$AUTOMODEL_ROOT"
+echo Testing automodel queries
+"${CODEQL_DIST}/codeql" test run test
+
+cd "$WORKSPACE_ROOT"
+
+echo Preparing release
+"${CODEQL_DIST}/codeql" pack release --groups $GRPS
+
+echo Publishing automodel
+"${CODEQL_DIST}/codeql" pack publish --groups $GRPS
+
+echo Bumping versions
+"${CODEQL_DIST}/codeql" pack post-release --groups $GRPS
+
+echo Automodel packs successfully published. Please commit and push the version changes.
diff --git a/java/ql/src/Telemetry/AutomodelAlertSinkUtil.qll b/java/ql/automodel/src/AutomodelAlertSinkUtil.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelAlertSinkUtil.qll
rename to java/ql/automodel/src/AutomodelAlertSinkUtil.qll
diff --git a/java/ql/src/Telemetry/AutomodelAlertSinks.ql b/java/ql/automodel/src/AutomodelAlertSinks.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelAlertSinks.ql
rename to java/ql/automodel/src/AutomodelAlertSinks.ql
diff --git a/java/ql/src/Telemetry/AutomodelAlertSinksPerQuery.ql b/java/ql/automodel/src/AutomodelAlertSinksPerQuery.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelAlertSinksPerQuery.ql
rename to java/ql/automodel/src/AutomodelAlertSinksPerQuery.ql
diff --git a/java/ql/src/Telemetry/AutomodelApplicationModeCharacteristics.qll b/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelApplicationModeCharacteristics.qll
rename to java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
diff --git a/java/ql/src/Telemetry/AutomodelApplicationModeExtractCandidates.ql b/java/ql/automodel/src/AutomodelApplicationModeExtractCandidates.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelApplicationModeExtractCandidates.ql
rename to java/ql/automodel/src/AutomodelApplicationModeExtractCandidates.ql
diff --git a/java/ql/src/Telemetry/AutomodelApplicationModeExtractNegativeExamples.ql b/java/ql/automodel/src/AutomodelApplicationModeExtractNegativeExamples.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelApplicationModeExtractNegativeExamples.ql
rename to java/ql/automodel/src/AutomodelApplicationModeExtractNegativeExamples.ql
diff --git a/java/ql/src/Telemetry/AutomodelApplicationModeExtractPositiveExamples.ql b/java/ql/automodel/src/AutomodelApplicationModeExtractPositiveExamples.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelApplicationModeExtractPositiveExamples.ql
rename to java/ql/automodel/src/AutomodelApplicationModeExtractPositiveExamples.ql
diff --git a/java/ql/src/Telemetry/AutomodelCandidateFilter.yml b/java/ql/automodel/src/AutomodelCandidateFilter.yml
similarity index 65%
rename from java/ql/src/Telemetry/AutomodelCandidateFilter.yml
rename to java/ql/automodel/src/AutomodelCandidateFilter.yml
index 52e64d54446b..c945ae3206fe 100644
--- a/java/ql/src/Telemetry/AutomodelCandidateFilter.yml
+++ b/java/ql/automodel/src/AutomodelCandidateFilter.yml
@@ -1,5 +1,5 @@
 extensions:
   - addsTo:
-      pack: codeql/java-queries
+      pack: codeql/java-automodel-queries
       extensible: automodelCandidateFilter
     data: []
diff --git a/java/ql/src/Telemetry/AutomodelCountGeneratedSinks.ql b/java/ql/automodel/src/AutomodelCountGeneratedSinks.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelCountGeneratedSinks.ql
rename to java/ql/automodel/src/AutomodelCountGeneratedSinks.ql
diff --git a/java/ql/src/Telemetry/AutomodelEndpointTypes.qll b/java/ql/automodel/src/AutomodelEndpointTypes.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelEndpointTypes.qll
rename to java/ql/automodel/src/AutomodelEndpointTypes.qll
diff --git a/java/ql/src/Telemetry/AutomodelFrameworkModeCharacteristics.qll b/java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelFrameworkModeCharacteristics.qll
rename to java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll
diff --git a/java/ql/src/Telemetry/AutomodelFrameworkModeExtractCandidates.ql b/java/ql/automodel/src/AutomodelFrameworkModeExtractCandidates.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelFrameworkModeExtractCandidates.ql
rename to java/ql/automodel/src/AutomodelFrameworkModeExtractCandidates.ql
diff --git a/java/ql/src/Telemetry/AutomodelFrameworkModeExtractNegativeExamples.ql b/java/ql/automodel/src/AutomodelFrameworkModeExtractNegativeExamples.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelFrameworkModeExtractNegativeExamples.ql
rename to java/ql/automodel/src/AutomodelFrameworkModeExtractNegativeExamples.ql
diff --git a/java/ql/src/Telemetry/AutomodelFrameworkModeExtractPositiveExamples.ql b/java/ql/automodel/src/AutomodelFrameworkModeExtractPositiveExamples.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelFrameworkModeExtractPositiveExamples.ql
rename to java/ql/automodel/src/AutomodelFrameworkModeExtractPositiveExamples.ql
diff --git a/java/ql/src/Telemetry/AutomodelJavaUtil.qll b/java/ql/automodel/src/AutomodelJavaUtil.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelJavaUtil.qll
rename to java/ql/automodel/src/AutomodelJavaUtil.qll
diff --git a/java/ql/src/Telemetry/AutomodelSharedCharacteristics.qll b/java/ql/automodel/src/AutomodelSharedCharacteristics.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelSharedCharacteristics.qll
rename to java/ql/automodel/src/AutomodelSharedCharacteristics.qll
diff --git a/java/ql/src/Telemetry/AutomodelSharedGetCallable.qll b/java/ql/automodel/src/AutomodelSharedGetCallable.qll
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelSharedGetCallable.qll
rename to java/ql/automodel/src/AutomodelSharedGetCallable.qll
diff --git a/java/ql/src/Telemetry/AutomodelSinkModelMrvaQueries.ql b/java/ql/automodel/src/AutomodelSinkModelMrvaQueries.ql
similarity index 100%
rename from java/ql/src/Telemetry/AutomodelSinkModelMrvaQueries.ql
rename to java/ql/automodel/src/AutomodelSinkModelMrvaQueries.ql
diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
new file mode 100644
index 000000000000..851dbe69e825
--- /dev/null
+++ b/java/ql/automodel/src/qlpack.yml
@@ -0,0 +1,10 @@
+name: codeql/java-automodel-queries
+version: 0.0.3-dev
+groups:
+    - java
+    - automodel
+dependencies:
+  codeql/java-all: ${workspace}
+dataExtensions:
+  - AutomodelCandidateFilter.yml
+warnOnImplicitThis: true
\ No newline at end of file
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.expected b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.expected
rename to java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.expected
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref
new file mode 100644
index 000000000000..5ea712b0239a
--- /dev/null
+++ b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref
@@ -0,0 +1 @@
+AutomodelApplicationModeExtractCandidates.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected
rename to java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.expected
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref
new file mode 100644
index 000000000000..ccd3827571ee
--- /dev/null
+++ b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref
@@ -0,0 +1 @@
+AutomodelApplicationModeExtractNegativeExamples.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected
rename to java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.expected
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref
new file mode 100644
index 000000000000..5cf6baa1dba0
--- /dev/null
+++ b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref
@@ -0,0 +1 @@
+AutomodelApplicationModeExtractPositiveExamples.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/Test.java b/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/Test.java
rename to java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.expected b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.expected
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.expected
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref
new file mode 100644
index 000000000000..e9b513032aaf
--- /dev/null
+++ b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref
@@ -0,0 +1 @@
+AutomodelFrameworkModeExtractCandidates.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.expected b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.expected
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.expected
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref
new file mode 100644
index 000000000000..69498caf8998
--- /dev/null
+++ b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref
@@ -0,0 +1 @@
+AutomodelFrameworkModeExtractNegativeExamples.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.expected b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.expected
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.expected
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.expected
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref
new file mode 100644
index 000000000000..fbda3f3dd376
--- /dev/null
+++ b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref
@@ -0,0 +1 @@
+AutomodelFrameworkModeExtractPositiveExamples.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/java/io/File.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/io/File.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/java/io/File.java
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/io/File.java
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/java/nio/file/Files.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/nio/file/Files.java
similarity index 100%
rename from java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/java/nio/file/Files.java
rename to java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/nio/file/Files.java
diff --git a/java/ql/automodel/test/qlpack.yml b/java/ql/automodel/test/qlpack.yml
new file mode 100644
index 000000000000..11f5ec8c1926
--- /dev/null
+++ b/java/ql/automodel/test/qlpack.yml
@@ -0,0 +1,12 @@
+name: codeql/java-automodel-tests
+version: 0.0.1-dev
+groups:
+    - java
+    - automodel
+    - test
+dependencies:
+  codeql/java-all: ${workspace}
+  codeql/java-automodel-queries: ${workspace}
+extractor: java
+tests: .
+warnOnImplicitThis: true
\ No newline at end of file
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll b/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll
index 745cf7934f0a..5f1996989ade 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/ModelExclusions.qll
@@ -27,7 +27,7 @@ class TestLibrary extends RefType {
 /** Holds if the given file is a test file. */
 private predicate isInTestFile(File file) {
   file.getAbsolutePath().matches(["%/test/%", "%/guava-tests/%", "%/guava-testlib/%"]) and
-  not file.getAbsolutePath().matches("%/ql/test/%") // allows our test cases to work
+  not file.getAbsolutePath().matches(["%/ql/test/%", "%/ql/automodel/test/%"]) // allows our test cases to work
 }
 
 /** Holds if the given compilation unit's package is a JDK internal. */
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index f59cc007d5c2..b2a297894fa8 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -12,5 +12,4 @@ dependencies:
   codeql/util: ${workspace}
 dataExtensions:
   - Telemetry/ExtractorInformation.yml
-  - Telemetry/AutomodelCandidateFilter.yml
 warnOnImplicitThis: true
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref b/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref
deleted file mode 100644
index b97c87be55fd..000000000000
--- a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractCandidates.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Telemetry/AutomodelApplicationModeExtractCandidates.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref b/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref
deleted file mode 100644
index 43610d3cc1a5..000000000000
--- a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractNegativeExamples.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Telemetry/AutomodelApplicationModeExtractNegativeExamples.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref b/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref
deleted file mode 100644
index 585a78f94f92..000000000000
--- a/java/ql/test/query-tests/Telemetry/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractPositiveExamples.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Telemetry/AutomodelApplicationModeExtractPositiveExamples.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref b/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref
deleted file mode 100644
index e68551eb3ec7..000000000000
--- a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractCandidates.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Telemetry/AutomodelFrameworkModeExtractCandidates.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref b/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref
deleted file mode 100644
index d58a0997fdc5..000000000000
--- a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractNegativeExamples.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Telemetry/AutomodelFrameworkModeExtractNegativeExamples.ql
diff --git a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref b/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref
deleted file mode 100644
index ae52dc664968..000000000000
--- a/java/ql/test/query-tests/Telemetry/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractPositiveExamples.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Telemetry/AutomodelFrameworkModeExtractPositiveExamples.ql