diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts
index 37a380779..cbf814593 100644
--- a/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts
+++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/remote-queries/remote-query-history.test.ts
@@ -87,6 +87,8 @@ describe('Remote queries and query history manager', function() {
     // set a higher timeout since recursive delete below may take a while, expecially on Windows.
     this.timeout(120000);
     deleteHistoryState();
+    disposables.dispose(testDisposeHandler);
+    sandbox.restore();
   });
 
   beforeEach(() => {
@@ -121,11 +123,6 @@ describe('Remote queries and query history manager', function() {
     openTextDocumentSpy = sandbox.spy(workspace, 'openTextDocument');
   });
 
-  afterEach(() => {
-    disposables.dispose(testDisposeHandler);
-    sandbox.restore();
-  });
-
   it('should read query history', async () => {
     await qhm.readQueryHistory();