diff --git a/vscode/src/extension.ts b/vscode/src/extension.ts
index c3c4898..aa6f9a7 100644
--- a/vscode/src/extension.ts
+++ b/vscode/src/extension.ts
@@ -946,7 +946,7 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
             debugConfig['testRun'] = testRun;
 
             const workspaceFolder = vscode.workspace.getWorkspaceFolder(docUri);
-            if (project || testRun) {
+            if (project) {
                 debugConfig['projectFile'] = docUri.toString();
                 debugConfig['project'] = true;
             } else {
@@ -993,6 +993,12 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
     context.subscriptions.push(commands.registerCommand(COMMAND_PREFIX + '.debug.single', async (uri, methodName?, launchConfiguration?, nestedClass?) => {
         await runDebug(false, false, uri, methodName, nestedClass, launchConfiguration);
     }));
+    context.subscriptions.push(commands.registerCommand(COMMAND_PREFIX + '.run.test.single', async (uri, methodName?, launchConfiguration?, nestedClass?) => {
+        await runDebug(true, true, uri, methodName, nestedClass, launchConfiguration);
+    }));
+    context.subscriptions.push(commands.registerCommand(COMMAND_PREFIX + '.debug.test.single', async (uri, methodName?, launchConfiguration?, nestedClass?) => {
+        await runDebug(false, true, uri, methodName, nestedClass, launchConfiguration);
+    }));
     context.subscriptions.push(commands.registerCommand(COMMAND_PREFIX + '.project.run', async (node, launchConfiguration?) => {
         return runDebug(true, false, contextUri(node)?.toString() || '',  undefined, undefined, launchConfiguration, true);
     }));
diff --git a/vscode/src/testAdapter.ts b/vscode/src/testAdapter.ts
index 4afcc71..aa7988c 100644
--- a/vscode/src/testAdapter.ts
+++ b/vscode/src/testAdapter.ts
@@ -107,7 +107,7 @@ export class NbTestAdapter {
                         }
                         if (!cancellation.isCancellationRequested) {
                             try {
-                                await commands.executeCommand(request.profile?.kind === TestRunProfileKind.Debug ? COMMAND_PREFIX + '.debug.single' : COMMAND_PREFIX + '.run.single', item.uri.toString(), idx < 0 ? undefined : item.id.slice(idx + 1), 
+                                await commands.executeCommand(request.profile?.kind === TestRunProfileKind.Debug ? COMMAND_PREFIX + '.debug.test.single' : COMMAND_PREFIX + '.run.test.single', item.uri.toString(), idx < 0 ? undefined : item.id.slice(idx + 1), 
                                     undefined /* configuration */, nestedClass);
                             } catch(err) {
                                 // test state will be handled in the code below