diff --git a/extensions/ql-vscode/src/ast-cfg-commands.ts b/extensions/ql-vscode/src/ast-cfg-commands.ts
index 3e544aea050..3536718183a 100644
--- a/extensions/ql-vscode/src/ast-cfg-commands.ts
+++ b/extensions/ql-vscode/src/ast-cfg-commands.ts
@@ -6,7 +6,7 @@ import {
   TemplatePrintCfgProvider,
 } from "./contextual/templateProvider";
 import { AstCfgCommands } from "./common/commands";
-import { LocalQueries } from "./local-queries/local-queries";
+import { LocalQueries } from "./local-queries";
 
 type AstCfgOptions = {
   localQueries: LocalQueries;
diff --git a/extensions/ql-vscode/src/debugger/debug-configuration.ts b/extensions/ql-vscode/src/debugger/debug-configuration.ts
index 50013f966a0..c25e4fc6fbc 100644
--- a/extensions/ql-vscode/src/debugger/debug-configuration.ts
+++ b/extensions/ql-vscode/src/debugger/debug-configuration.ts
@@ -5,7 +5,7 @@ import {
   WorkspaceFolder,
 } from "vscode";
 import { getOnDiskWorkspaceFolders, showAndLogErrorMessage } from "../helpers";
-import { LocalQueries } from "../local-queries/local-queries";
+import { LocalQueries } from "../local-queries";
 import { getQuickEvalContext, validateQueryPath } from "../run-queries-shared";
 import * as CodeQLProtocol from "./debug-protocol";
 import { getErrorMessage } from "../pure/helpers-pure";
diff --git a/extensions/ql-vscode/src/debugger/debugger-factory.ts b/extensions/ql-vscode/src/debugger/debugger-factory.ts
index c7e7209c855..988522f7b48 100644
--- a/extensions/ql-vscode/src/debugger/debugger-factory.ts
+++ b/extensions/ql-vscode/src/debugger/debugger-factory.ts
@@ -9,7 +9,7 @@ import {
   ProviderResult,
 } from "vscode";
 import { isCanary } from "../config";
-import { LocalQueries } from "../local-queries/local-queries";
+import { LocalQueries } from "../local-queries";
 import { DisposableObject } from "../pure/disposable-object";
 import { QueryRunner } from "../queryRunner";
 import { QLDebugConfigurationProvider } from "./debug-configuration";
diff --git a/extensions/ql-vscode/src/debugger/debugger-ui.ts b/extensions/ql-vscode/src/debugger/debugger-ui.ts
index 06838c67f3a..2dff1a7b6e2 100644
--- a/extensions/ql-vscode/src/debugger/debugger-ui.ts
+++ b/extensions/ql-vscode/src/debugger/debugger-ui.ts
@@ -9,7 +9,6 @@ import {
 } from "vscode";
 import { DebuggerCommands } from "../common/commands";
 import { DatabaseManager } from "../local-databases";
-import { LocalQueries } from "../local-queries/local-queries";
 import { DisposableObject } from "../pure/disposable-object";
 import { CoreQueryResults } from "../queryRunner";
 import {
@@ -20,7 +19,7 @@ import {
 import { QLResolvedDebugConfiguration } from "./debug-configuration";
 import * as CodeQLProtocol from "./debug-protocol";
 import { App } from "../common/app";
-import { LocalQueryRun } from "../local-queries/local-query-run";
+import { LocalQueryRun, LocalQueries } from "../local-queries";
 
 /**
  * Listens to messages passing between VS Code and the debug adapter, so that we can supplement the
diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
index 6d1e8564542..f09fe6565ea 100644
--- a/extensions/ql-vscode/src/extension.ts
+++ b/extensions/ql-vscode/src/extension.ts
@@ -117,7 +117,7 @@ import {
   PreActivationCommands,
   QueryServerCommands,
 } from "./common/commands";
-import { LocalQueries } from "./local-queries/local-queries";
+import { LocalQueries } from "./local-queries";
 import { getAstCfgCommands } from "./ast-cfg-commands";
 import { getQueryEditorCommands } from "./query-editor";
 import { App } from "./common/app";
diff --git a/extensions/ql-vscode/src/local-queries/index.ts b/extensions/ql-vscode/src/local-queries/index.ts
new file mode 100644
index 00000000000..3f1183b7bdc
--- /dev/null
+++ b/extensions/ql-vscode/src/local-queries/index.ts
@@ -0,0 +1,2 @@
+export * from "./local-queries";
+export * from "./local-query-run";
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts
index 3aa08a7f64d..e951b3ad425 100644
--- a/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts
@@ -19,7 +19,7 @@ import { CliVersionConstraint, CodeQLCliServer } from "../../../src/cli";
 import { describeWithCodeQL } from "../cli";
 import { CoreCompletedQuery, QueryRunner } from "../../../src/queryRunner";
 import { SELECT_QUERY_NAME } from "../../../src/contextual/locationFinder";
-import { LocalQueries } from "../../../src/local-queries/local-queries";
+import { LocalQueries } from "../../../src/local-queries";
 import { QueryResultType } from "../../../src/pure/new-messages";
 import { createVSCodeCommandManager } from "../../../src/common/vscode/commands";
 import {