diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts
index ea73efcef..a962ca88a 100644
--- a/extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts
@@ -111,11 +111,20 @@ describeWithCodeQL()("using the legacy query server", () => {
   let qs: qsClient.QueryServerClient;
   let cliServer: cli.CodeQLCliServer;
 
+  let supportNewQueryServer = false;
+
   beforeAll(async () => {
     const extension = await getActivatedExtension();
     cliServer = extension.cliServer;
     cliServer.quiet = true;
 
+    if (await cliServer.cliConstraints.supportsNewQueryServerForTests()) {
+      console.log(
+        "Skipping legacy-query tests: the CLI supports the new query server",
+      );
+      supportNewQueryServer = true;
+    }
+
     qs = new QueryServerClient(
       createMockApp({}),
       {
@@ -145,10 +154,18 @@ describeWithCodeQL()("using the legacy query server", () => {
     const parsedResults = new Checkpoint<void>();
 
     it("should register the database if necessary", async () => {
+      if (supportNewQueryServer) {
+        return;
+      }
+
       await qs.sendRequest(messages.registerDatabases, { databases: [db] });
     });
 
     it(`should be able to compile query ${queryName}`, async () => {
+      if (supportNewQueryServer) {
+        return;
+      }
+
       expect(existsSync(queryTestCase.queryPath)).toBe(true);
       try {
         const qlProgram: messages.QlProgram = {
@@ -188,6 +205,10 @@ describeWithCodeQL()("using the legacy query server", () => {
     });
 
     it(`should be able to run query ${queryName}`, async () => {
+      if (supportNewQueryServer) {
+        return;
+      }
+
       try {
         await compilationSucceeded.done();
         const callbackId = qs.registerCallback((_res) => {
@@ -217,6 +238,10 @@ describeWithCodeQL()("using the legacy query server", () => {
 
     const actualResultSets: ResultSets = {};
     it(`should be able to parse results of query ${queryName}`, async () => {
+      if (supportNewQueryServer) {
+        return;
+      }
+
       await evaluationSucceeded.done();
       const info = await cliServer.bqrsInfo(RESULTS_PATH);
 
@@ -231,6 +256,10 @@ describeWithCodeQL()("using the legacy query server", () => {
     });
 
     it(`should have correct results for query ${queryName}`, async () => {
+      if (supportNewQueryServer) {
+        return;
+      }
+
       await parsedResults.done();
       expect(actualResultSets).not.toEqual({});
       expect(Object.keys(actualResultSets!).sort()).toEqual(
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts
index 30f2e6beb..1447f5b7b 100644
--- a/extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts
@@ -114,6 +114,9 @@ describeWithCodeQL()("using the new query server", () => {
 
     cliServer.quiet = true;
     if (!(await cliServer.cliConstraints.supportsNewQueryServerForTests())) {
+      console.log(
+        "Skipping new-query tests: the CLI supports only the legacy query server",
+      );
       supportNewQueryServer = false;
     }
     qs = new QueryServerClient(