diff --git a/codeql-extractor.yml b/codeql-extractor.yml
index 3e98f064425..3c81755de5c 100644
--- a/codeql-extractor.yml
+++ b/codeql-extractor.yml
@@ -14,3 +14,4 @@ file_types:
     display_name: Go
     extensions:
       - .go
+legacy_qltest_extraction: true
diff --git a/codeql-tools/index.cmd b/codeql-tools/index.cmd
new file mode 100644
index 00000000000..15d7548c1d9
--- /dev/null
+++ b/codeql-tools/index.cmd
@@ -0,0 +1,7 @@
+@echo off
+SETLOCAL EnableDelayedExpansion
+
+type NUL && "%CODEQL_EXTRACTOR_GO_ROOT%/tools/%CODEQL_PLATFORM%/go-extractor.exe" -mod=vendor ./...
+exit /b %ERRORLEVEL%
+
+ENDLOCAL
diff --git a/codeql-tools/index.sh b/codeql-tools/index.sh
new file mode 100755
index 00000000000..655fb5eeca3
--- /dev/null
+++ b/codeql-tools/index.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -eu
+
+if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; then
+    echo "Automatic build detection for $CODEQL_PLATFORM is not implemented."
+    exit 1
+fi
+
+"$CODEQL_EXTRACTOR_GO_ROOT/tools/$CODEQL_PLATFORM/go-extractor" -mod=vendor ./...
diff --git a/ql/test/queries.xml b/ql/test/queries.xml
new file mode 100644
index 00000000000..6a456b21d09
--- /dev/null
+++ b/ql/test/queries.xml
@@ -0,0 +1 @@
+<queries language="go"/>