diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/debug.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/debug.test.ts
index 0c4c6d95c9b..63baccba1d2 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/debug.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/debug.test.ts
@@ -37,8 +37,7 @@ suite('Debug', function () {
 		disposeAll(toDispose);
 	});
 
-	// TODO@isidor seems to fail
-	test.skip('start debugging', async function () {
+	test('start debugging', async function () {
 		assert.equal(debug.activeDebugSession, undefined);
 		let stoppedEvents = 0;
 		let variablesReceived: () => void;
@@ -47,7 +46,7 @@ suite('Debug', function () {
 
 		const firstVariablesRetrieved = new Promise<void>(resolve => variablesReceived = resolve);
 		const toDispose: Disposable[] = [];
-		toDispose.push(debug.registerDebugAdapterTrackerFactory('node2', {
+		toDispose.push(debug.registerDebugAdapterTrackerFactory('*', {
 			createDebugAdapterTracker: () => ({
 				onDidSendMessage: m => {
 					if (m.event === 'stopped') {
@@ -68,16 +67,13 @@ suite('Debug', function () {
 
 		const initializedPromise = new Promise<void>(resolve => initializedReceived = resolve);
 		const configurationDonePromise = new Promise<void>(resolve => configurationDoneReceived = resolve);
-		// Do not await debug start to return due to https://github.com/microsoft/vscode/issues/90134
-		debug.startDebugging(workspace.workspaceFolders![0], 'Launch debug.js');
+		const success = await debug.startDebugging(workspace.workspaceFolders![0], 'Launch debug.js');
+		assert.equal(success, true);
 		await initializedPromise;
 		await configurationDonePromise;
 
-		// Do not verify activeDebugSession due to same flakiness that sometimes start debugging does not return
-		// assert.notEqual(debug.activeDebugSession, undefined);
-		// assert.equal(debug.activeDebugSession?.name, 'Launch debug.js');
-
 		await firstVariablesRetrieved;
+		assert.notEqual(debug.activeDebugSession, undefined);
 		assert.equal(stoppedEvents, 1);
 
 		const secondVariablesRetrieved = new Promise<void>(resolve => variablesReceived = resolve);
@@ -110,8 +106,6 @@ suite('Debug', function () {
 		const sessionTerminatedPromise = new Promise<void>(resolve => sessionTerminated = resolve);
 		await commands.executeCommand('workbench.action.debug.stop');
 		await sessionTerminatedPromise;
-		assert.equal(debug.activeDebugSession, undefined);
-
 		disposeAll(toDispose);
 	});
 
diff --git a/extensions/vscode-api-tests/testWorkspace/.vscode/launch.json b/extensions/vscode-api-tests/testWorkspace/.vscode/launch.json
index aab0367ea2b..518e00c6724 100644
--- a/extensions/vscode-api-tests/testWorkspace/.vscode/launch.json
+++ b/extensions/vscode-api-tests/testWorkspace/.vscode/launch.json
@@ -5,7 +5,7 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "node",
+            "type": "pwa-node",
             "request": "launch",
             "name": "Launch debug.js",
             "stopOnEntry": true,