diff --git a/.vscode-test.js b/.vscode-test.js
index 46bfed76c53..917413ede2a 100644
--- a/.vscode-test.js
+++ b/.vscode-test.js
@@ -65,18 +65,6 @@ const extensions = [
 	{
 		label: 'microsoft-authentication',
 		mocha: { timeout: 60_000 }
-	},
-	{
-		label: 'vscode-api-tests-folder',
-		workspaceFolder: `extensions/vscode-api-tests/testWorkspace`,
-		mocha: { timeout: 60_000 },
-		files: 'extensions/vscode-api-tests/out/singlefolder-tests/**/*.test.js',
-	},
-	{
-		label: 'vscode-api-tests-workspace',
-		workspaceFolder: `extensions/vscode-api-tests/testworkspace.code-workspace`,
-		mocha: { timeout: 60_000 },
-		files: 'extensions/vscode-api-tests/out/workspace-tests/**/*.test.js',
 	}
 ];
 
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index 59a8fe2d23d..b59cceada07 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -39,12 +39,12 @@ set API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --skip-release-notes
 
 echo.
 echo ### API tests (folder)
-call npm run test-extension -- -l vscode-api-tests-folder
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-api-tests\testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out\singlefolder-tests %API_TESTS_EXTRA_ARGS%
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
 echo ### API tests (workspace)
-call npm run test-extension -- -l vscode-api-tests-workspace
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-api-tests\testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out\workspace-tests %API_TESTS_EXTRA_ARGS%
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
index 3d4a5320905..89006480308 100755
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -55,13 +55,13 @@ fi
 echo
 echo "### API tests (folder)"
 echo
-npm run test-extension -- -l vscode-api-tests-folder
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-api-tests/testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests $API_TESTS_EXTRA_ARGS
 kill_app
 
 echo
 echo "### API tests (workspace)"
 echo
-npm run test-extension -- -l vscode-api-tests-workspace
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests $API_TESTS_EXTRA_ARGS
 kill_app
 
 echo
@@ -71,7 +71,7 @@ npm run test-extension -- -l vscode-colorize-tests
 kill_app
 
 echo
-echo "### Terminal Suggest tests"
+echo "### Terminal Suggest tests" 
 echo
 npm run test-extension -- -l terminal-suggest --enable-proposed-api=vscode.vscode-api-tests
 kill_app