diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json
index 2ffcc4b4c..bff0b9a10 100644
--- a/extensions/ql-vscode/package-lock.json
+++ b/extensions/ql-vscode/package-lock.json
@@ -101,6 +101,7 @@
         "proxyquire": "~2.1.3",
         "sinon": "~9.0.0",
         "sinon-chai": "~3.5.0",
+        "source-map-support": "^0.5.21",
         "style-loader": "~0.23.1",
         "through2": "^4.0.2",
         "ts-loader": "^8.1.0",
@@ -11237,9 +11238,9 @@
       }
     },
     "node_modules/source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
@@ -22861,9 +22862,9 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json
index bd506a6d5..d503b9ee5 100644
--- a/extensions/ql-vscode/package.json
+++ b/extensions/ql-vscode/package.json
@@ -1202,6 +1202,7 @@
     "proxyquire": "~2.1.3",
     "sinon": "~9.0.0",
     "sinon-chai": "~3.5.0",
+    "source-map-support": "^0.5.21",
     "style-loader": "~0.23.1",
     "through2": "^4.0.2",
     "ts-loader": "^8.1.0",
diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
index b4c0c6714..0aa03de45 100644
--- a/extensions/ql-vscode/src/extension.ts
+++ b/extensions/ql-vscode/src/extension.ts
@@ -1,3 +1,4 @@
+import 'source-map-support/register';
 import {
   CancellationToken,
   CancellationTokenSource,
diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/helpers.test.ts b/extensions/ql-vscode/src/vscode-tests/cli-integration/helpers.test.ts
index 852d7c199..cdcf2c845 100644
--- a/extensions/ql-vscode/src/vscode-tests/cli-integration/helpers.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/cli-integration/helpers.test.ts
@@ -1,6 +1,5 @@
 import * as path from 'path';
 import { extensions } from 'vscode';
-import 'mocha';
 
 import { CodeQLCliServer } from '../../cli';
 import { CodeQLExtensionInterface } from '../../extension';
diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/index.ts b/extensions/ql-vscode/src/vscode-tests/cli-integration/index.ts
index d6fa49763..1611fb582 100644
--- a/extensions/ql-vscode/src/vscode-tests/cli-integration/index.ts
+++ b/extensions/ql-vscode/src/vscode-tests/cli-integration/index.ts
@@ -1,7 +1,9 @@
+import 'source-map-support/register';
 import { runTestsInDirectory } from '../index-template';
 import 'mocha';
 import * as sinonChai from 'sinon-chai';
 import * as chai from 'chai';
+import 'chai/register-should';
 import * as chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised);
 chai.use(sinonChai);
diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts b/extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts
index 343b7bb86..6e720970b 100644
--- a/extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts
@@ -1,6 +1,5 @@
 import * as sinon from 'sinon';
 import { extensions, window } from 'vscode';
-import 'mocha';
 import * as path from 'path';
 
 import * as pq from 'proxyquire';
diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/queries.test.ts b/extensions/ql-vscode/src/vscode-tests/cli-integration/queries.test.ts
index 990093ffe..8689e2c30 100644
--- a/extensions/ql-vscode/src/vscode-tests/cli-integration/queries.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/cli-integration/queries.test.ts
@@ -3,7 +3,6 @@ import { CancellationToken, commands, ExtensionContext, extensions, Uri } from '
 import * as sinon from 'sinon';
 import * as path from 'path';
 import * as fs from 'fs-extra';
-import 'mocha';
 import { expect } from 'chai';
 import * as yaml from 'js-yaml';
 
diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/query.test.ts b/extensions/ql-vscode/src/vscode-tests/cli-integration/query.test.ts
index ce6113a64..bb90a352c 100644
--- a/extensions/ql-vscode/src/vscode-tests/cli-integration/query.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/cli-integration/query.test.ts
@@ -1,6 +1,5 @@
 import { expect } from 'chai';
 import * as fs from 'fs-extra';
-import 'mocha';
 import * as path from 'path';
 import * as tmp from 'tmp';
 import * as url from 'url';
diff --git a/extensions/ql-vscode/src/vscode-tests/cli-integration/run-remote-query.test.ts b/extensions/ql-vscode/src/vscode-tests/cli-integration/run-remote-query.test.ts
index 0b3888792..c5a7d78de 100644
--- a/extensions/ql-vscode/src/vscode-tests/cli-integration/run-remote-query.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/cli-integration/run-remote-query.test.ts
@@ -2,7 +2,6 @@ import { assert, expect } from 'chai';
 import * as path from 'path';
 import * as sinon from 'sinon';
 import { CancellationToken, extensions, QuickPickItem, Uri, window } from 'vscode';
-import 'mocha';
 import * as fs from 'fs-extra';
 import * as os from 'os';
 import * as yaml from 'js-yaml';
diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/activation.test.ts b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/activation.test.ts
index f8e0bfba4..f433f8ab7 100644
--- a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/activation.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/activation.test.ts
@@ -1,13 +1,8 @@
 import * as assert from 'assert';
-import * as chai from 'chai';
-import * as chaiAsPromised from 'chai-as-promised';
-import 'mocha';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import * as determiningSelectedQueryTest from './determining-selected-query-test';
 
-chai.use(chaiAsPromised);
-
 describe('launching with a minimal workspace', async () => {
 
   const ext = vscode.extensions.getExtension('GitHub.vscode-codeql');
diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/config.test.ts b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/config.test.ts
index 03c961317..b947a7c47 100644
--- a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/config.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/config.test.ts
@@ -1,9 +1,6 @@
 import 'vscode-test';
-import 'mocha';
-import * as chaiAsPromised from 'chai-as-promised';
-import 'sinon-chai';
 import * as Sinon from 'sinon';
-import * as chai from 'chai';
+import { expect } from 'chai';
 import { workspace } from 'vscode';
 
 import {
@@ -12,9 +9,6 @@ import {
   QueryServerConfigListener
 } from '../../config';
 
-chai.use(chaiAsPromised);
-const expect = chai.expect;
-
 describe('config listeners', function() {
   // Because we are adding some extra waiting, need to bump the test timeouts.
   this.timeout(5000);
diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases.test.ts b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases.test.ts
index f2c3b1f9d..675bb7341 100644
--- a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases.test.ts
@@ -1,5 +1,4 @@
 import 'vscode-test';
-import 'mocha';
 import * as sinon from 'sinon';
 import * as tmp from 'tmp';
 import * as fs from 'fs-extra';
diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/index.ts b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/index.ts
index 320ed14b6..aac9767e4 100644
--- a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/index.ts
+++ b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/index.ts
@@ -1,12 +1,13 @@
+import 'source-map-support/register';
 import { runTestsInDirectory } from '../index-template';
 
 import * as sinonChai from 'sinon-chai';
 import * as chai from 'chai';
+import 'chai/register-should';
 import * as chaiAsPromised from 'chai-as-promised';
 chai.use(chaiAsPromised);
 chai.use(sinonChai);
 
-
 export function run(): Promise<void> {
   return runTestsInDirectory(__dirname);
 }
diff --git a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/qltest-discovery.test.ts b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/qltest-discovery.test.ts
index d0445ad63..cbf20daf0 100644
--- a/extensions/ql-vscode/src/vscode-tests/minimal-workspace/qltest-discovery.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/minimal-workspace/qltest-discovery.test.ts
@@ -1,5 +1,4 @@
 import 'vscode-test';
-import 'mocha';
 import { Uri, WorkspaceFolder } from 'vscode';
 import { expect } from 'chai';
 import * as fs from 'fs-extra';
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/astViewer.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/astViewer.test.ts
index 7e07ee8d8..62d8c2dc0 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/astViewer.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/astViewer.test.ts
@@ -1,6 +1,5 @@
 import * as fs from 'fs-extra';
-import * as chai from 'chai';
-import * as chaiAsPromised from 'chai-as-promised';
+import { expect } from 'chai';
 import * as sinon from 'sinon';
 import * as yaml from 'js-yaml';
 
@@ -9,11 +8,6 @@ import { commands, Range, Uri } from 'vscode';
 import { DatabaseItem } from '../../databases';
 import { testDisposeHandler } from '../test-dispose-handler';
 
-chai.use(chaiAsPromised);
-const expect = chai.expect;
-
-
-
 describe('AstViewer', () => {
   let astRoots: AstItem[];
   let viewer: AstViewer | undefined;
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/astBuilder.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/astBuilder.test.ts
index 1ccf61550..f5e178ff0 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/astBuilder.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/astBuilder.test.ts
@@ -1,6 +1,5 @@
 import * as fs from 'fs-extra';
-import * as chai from 'chai';
-import * as chaiAsPromised from 'chai-as-promised';
+import { expect } from 'chai';
 import * as sinon from 'sinon';
 
 import AstBuilder from '../../../contextual/astBuilder';
@@ -9,9 +8,6 @@ import { CodeQLCliServer } from '../../../cli';
 import { DatabaseItem } from '../../../databases';
 import { Uri } from 'vscode';
 
-chai.use(chaiAsPromised);
-const expect = chai.expect;
-
 /**
  *
 This test uses an AST generated from this file (already BQRS-decoded in ../data/astBuilder.json):
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts
index 7cdfaf9fd..1999ed89d 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/fileRangeFromURI.test.ts
@@ -1,5 +1,4 @@
 import 'vscode-test';
-import 'mocha';
 import { expect } from 'chai';
 import { Uri, Range } from 'vscode';
 
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/queryResolver.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/queryResolver.test.ts
index 450d4f0c8..52f99bbdb 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/queryResolver.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/contextual/queryResolver.test.ts
@@ -1,18 +1,12 @@
 import 'vscode-test';
-import 'mocha';
 import * as yaml from 'js-yaml';
-import * as chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
-import * as chai from 'chai';
-import * as sinonChai from 'sinon-chai';
+import { expect } from 'chai';
 import * as pq from 'proxyquire';
 import { KeyType } from '../../../contextual/keyType';
 import { getErrorMessage } from '../../../pure/helpers-pure';
 
 const proxyquire = pq.noPreserveCache().noCallThru();
-chai.use(chaiAsPromised);
-chai.use(sinonChai);
-const expect = chai.expect;
 
 describe('queryResolver', () => {
   let module: Record<string, Function>;
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/databaseFetcher.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/databaseFetcher.test.ts
index 06294e6c7..46d5918f3 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/databaseFetcher.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/databaseFetcher.test.ts
@@ -1,11 +1,9 @@
 import 'vscode-test';
-import 'mocha';
-import * as chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
 import * as path from 'path';
 import * as fs from 'fs-extra';
 import * as tmp from 'tmp';
-import * as chai from 'chai';
+import { expect } from 'chai';
 import { window } from 'vscode';
 
 import {
@@ -18,8 +16,6 @@ import { ProgressCallback } from '../../commandRunner';
 import * as pq from 'proxyquire';
 
 const proxyquire = pq.noPreserveCache();
-chai.use(chaiAsPromised);
-const expect = chai.expect;
 
 describe('databaseFetcher', function() {
   // These tests make API calls and may need extra time to complete.
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/databases-ui.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/databases-ui.test.ts
index 656a57f95..61cfebe43 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/databases-ui.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/databases-ui.test.ts
@@ -1,5 +1,4 @@
 import 'vscode-test';
-import 'mocha';
 import * as tmp from 'tmp';
 import * as path from 'path';
 import * as fs from 'fs-extra';
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/distribution.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/distribution.test.ts
index eff378e69..9c76012a7 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/distribution.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/distribution.test.ts
@@ -1,18 +1,13 @@
-import * as chai from 'chai';
+import { expect } from 'chai';
 import * as path from 'path';
 import * as fetch from 'node-fetch';
-import 'chai/register-should';
 import * as semver from 'semver';
-import * as sinonChai from 'sinon-chai';
 import * as sinon from 'sinon';
 import * as pq from 'proxyquire';
-import 'mocha';
 
 import { GithubRelease, GithubReleaseAsset, ReleasesApiConsumer } from '../../distribution';
 
 const proxyquire = pq.noPreserveCache();
-chai.use(sinonChai);
-const expect = chai.expect;
 
 describe('Releases API consumer', () => {
   const owner = 'someowner';
@@ -95,7 +90,7 @@ describe('Releases API consumer', () => {
     it('fails if none of the releases are within the version range', async () => {
       const consumer = new MockReleasesApiConsumer(owner, repo);
 
-      await chai.expect(
+      await expect(
         consumer.getLatestRelease(new semver.Range('5.*.*'))
       ).to.be.rejectedWith(Error);
     });
@@ -114,7 +109,7 @@ describe('Releases API consumer', () => {
     it('fails if none of the releases pass the additional compatibility test', async () => {
       const consumer = new MockReleasesApiConsumer(owner, repo);
 
-      await chai.expect(consumer.getLatestRelease(
+      await expect(consumer.getLatestRelease(
         new semver.Range('2.*.*'),
         true,
         release => release.assets.some(asset => asset.name === 'otherExampleAsset.txt')
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts
index 6af5fdda7..0471bf910 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts
@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-import 'mocha';
 import {
   EnvironmentVariableCollection,
   EnvironmentVariableMutator,
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/index.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/index.ts
index 26b7bcc64..b2cc61552 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/index.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/index.ts
@@ -1,4 +1,13 @@
+import 'source-map-support/register';
 import { runTestsInDirectory } from '../index-template';
+import * as sinonChai from 'sinon-chai';
+import * as chai from 'chai';
+import * as chaiAsPromised from 'chai-as-promised';
+import 'chai/register-should';
+
+chai.use(chaiAsPromised);
+chai.use(sinonChai);
+
 export function run(): Promise<void> {
   return runTestsInDirectory(__dirname);
 }
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/query-history.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/query-history.test.ts
index 32f52ad5e..4123bc29e 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/query-history.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/query-history.test.ts
@@ -1,12 +1,9 @@
 import * as fs from 'fs-extra';
 import * as path from 'path';
-import * as chai from 'chai';
-import 'mocha';
-import 'sinon-chai';
+import { expect, assert } from 'chai';
 import * as vscode from 'vscode';
 import * as sinon from 'sinon';
 
-import * as chaiAsPromised from 'chai-as-promised';
 import { logger } from '../../logging';
 import { registerQueryHistoryScubber } from '../../query-history-scrubber';
 import { QueryHistoryManager, HistoryTreeDataProvider, SortOrder } from '../../query-history';
@@ -21,10 +18,6 @@ import { ONE_DAY_IN_MS, ONE_HOUR_IN_MS, TWO_HOURS_IN_MS, THREE_HOURS_IN_MS } fro
 import { tmpDir } from '../../helpers';
 import { getErrorMessage } from '../../pure/helpers-pure';
 
-chai.use(chaiAsPromised);
-const expect = chai.expect;
-const assert = chai.assert;
-
 describe('query-history', () => {
   const mockExtensionLocation = path.join(tmpDir.name, 'mock-extension-location');
   let configListener: QueryHistoryConfigListener;
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/query-results.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/query-results.test.ts
index 893ef6127..eec22453c 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/query-results.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/query-results.test.ts
@@ -1,10 +1,7 @@
-import * as chai from 'chai';
+import { expect } from 'chai';
 import * as path from 'path';
 import * as fs from 'fs-extra';
-import 'mocha';
-import 'sinon-chai';
 import * as sinon from 'sinon';
-import * as chaiAsPromised from 'chai-as-promised';
 import { LocalQueryInfo, InitialQueryInfo, interpretResultsSarif } from '../../query-results';
 import { QueryEvaluationInfo, QueryWithResults } from '../../run-queries';
 import { QueryHistoryConfig } from '../../config';
@@ -15,9 +12,6 @@ import { CancellationTokenSource, Uri, env } from 'vscode';
 import { tmpDir } from '../../helpers';
 import { slurpQueryHistory, splatQueryHistory } from '../../query-serialization';
 
-chai.use(chaiAsPromised);
-const expect = chai.expect;
-
 describe('query-results', () => {
   let disposeSpy: sinon.SinonSpy;
   let onDidChangeQueryHistoryConfigurationSpy: sinon.SinonSpy;
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-query-history.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-query-history.test.ts
index 448ff8f96..38d099a17 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-query-history.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-query-history.test.ts
@@ -1,10 +1,7 @@
 import * as fs from 'fs-extra';
 import * as path from 'path';
 import * as sinon from 'sinon';
-import * as chai from 'chai';
-import 'mocha';
-import 'sinon-chai';
-import * as chaiAsPromised from 'chai-as-promised';
+import { expect } from 'chai';
 
 import { CancellationToken, ExtensionContext, Uri, window, workspace } from 'vscode';
 import { QueryHistoryConfig } from '../../config';
@@ -20,9 +17,6 @@ import { testDisposeHandler } from '../test-dispose-handler';
 import { walkDirectory } from '../../helpers';
 import { getErrorMessage } from '../../pure/helpers-pure';
 
-chai.use(chaiAsPromised);
-const expect = chai.expect;
-
 /**
  * Tests for remote queries and how they interact with the query history manager.
  */
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/run-queries.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/run-queries.test.ts
index 1b34faf79..eca2ab5ba 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/run-queries.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/run-queries.test.ts
@@ -1,18 +1,12 @@
-import * as chai from 'chai';
+import { expect } from 'chai';
 import * as path from 'path';
-import 'mocha';
-import 'sinon-chai';
 import * as sinon from 'sinon';
-import * as chaiAsPromised from 'chai-as-promised';
 import { Uri } from 'vscode';
 
 import { QueryEvaluationInfo } from '../../run-queries';
 import { Severity, compileQuery } from '../../pure/messages';
 import * as config from '../../config';
 
-chai.use(chaiAsPromised);
-const expect = chai.expect;
-
 describe('run-queries', () => {
   let sandbox: sinon.SinonSandbox;
   beforeEach(() => {
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/run-remote-query.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/run-remote-query.test.ts
index 1a149d45e..c55b7433c 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/run-remote-query.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/run-remote-query.test.ts
@@ -1,14 +1,10 @@
 import 'vscode-test';
-import 'mocha';
-import * as chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
-import * as chai from 'chai';
+import { expect } from 'chai';
 import { window } from 'vscode';
 import * as pq from 'proxyquire';
 
 const proxyquire = pq.noPreserveCache();
-chai.use(chaiAsPromised);
-const expect = chai.expect;
 
 describe('run-remote-query', function() {
 
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/telemetry.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/telemetry.test.ts
index e3391e6bb..8b08f6be2 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/telemetry.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/telemetry.test.ts
@@ -1,8 +1,5 @@
-import * as chai from 'chai';
-import 'mocha';
-import 'sinon-chai';
+import { expect } from 'chai';
 import * as sinon from 'sinon';
-import * as chaiAsPromised from 'chai-as-promised';
 import TelemetryReporter from 'vscode-extension-telemetry';
 import { ExtensionContext, workspace, ConfigurationTarget, window } from 'vscode';
 import { TelemetryListener, telemetryListener as globalTelemetryListener } from '../../telemetry';
@@ -10,9 +7,6 @@ import { UserCancellationException } from '../../commandRunner';
 import { fail } from 'assert';
 import { ENABLE_TELEMETRY } from '../../config';
 
-chai.use(chaiAsPromised);
-const expect = chai.expect;
-
 const sandbox = sinon.createSandbox();
 
 describe('telemetry reporting', function() {
diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/test-adapter.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/test-adapter.test.ts
index 8f7ef870d..f37868541 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/test-adapter.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/test-adapter.test.ts
@@ -1,5 +1,4 @@
 import 'vscode-test';
-import 'mocha';
 import * as sinon from 'sinon';
 import * as fs from 'fs-extra';
 import { Uri, WorkspaceFolder } from 'vscode';
@@ -138,7 +137,7 @@ describe('test-adapter', () => {
     // However, we can pretend the same thing by just returning an async array.
     runTestsSpy = sandox.stub();
     runTestsSpy.returns(
-      (async function* () {
+      (async function*() {
         yield Promise.resolve({
           test: Uri.parse('file:/ab/c/d.ql').fsPath,
           pass: true,