diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
index 5e66d0b1f18..eb0ed3f2618 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
@@ -367,13 +367,13 @@ suite('vscode API - window', () => {
 		const rightDiff = await createRandomFile();
 		await commands.executeCommand('vscode.diff', leftDiff, rightDiff, 'Diff', { viewColumn: ViewColumn.Three, preview: false });
 
-		// Wait for the tab change event to fire
-		await new Promise<void>((resolve) => {
+		// Wait for the tab change event to fire or 500ms
+		await Promise.race([new Promise<void>((resolve) => {
 			const dispsable = window.onDidChangeTabs(() => {
 				dispsable.dispose();
 				resolve();
 			});
-		});
+		}), new Promise(c => setTimeout(c, 500))]);
 
 		const tabs = window.tabs;
 		assert.strictEqual(tabs.length, 5);