diff --git a/test/hotspot/jtreg/ProblemList-svc-vthread.txt b/test/hotspot/jtreg/ProblemList-Virtual.txt
similarity index 100%
rename from test/hotspot/jtreg/ProblemList-svc-vthread.txt
rename to test/hotspot/jtreg/ProblemList-Virtual.txt
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/MainWrapper.java b/test/hotspot/jtreg/vmTestbase/nsk/share/MainWrapper.java
index fbdc0a07abf..6e91dd9bcbf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/MainWrapper.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/MainWrapper.java
@@ -46,7 +46,8 @@ public final class MainWrapper {
         Finalizer finalizer = new Finalizer(new FinalizableObject());
         finalizer.activate();
 
-
+        // Some tests use this property to understand if virtual threads are used
+        System.setProperty("main.wrapper", wrapperName);
 
         Runnable task = () -> {
             try {
diff --git a/test/jdk/ProblemList-svc-vthread.txt b/test/jdk/ProblemList-Virtual.txt
similarity index 100%
rename from test/jdk/ProblemList-svc-vthread.txt
rename to test/jdk/ProblemList-Virtual.txt
diff --git a/test/jdk/com/sun/jdi/TestScaffold.java b/test/jdk/com/sun/jdi/TestScaffold.java
index fd4e4aee25b..a39e3ddf8d6 100644
--- a/test/jdk/com/sun/jdi/TestScaffold.java
+++ b/test/jdk/com/sun/jdi/TestScaffold.java
@@ -513,6 +513,7 @@ abstract public class TestScaffold extends TargetAdapter {
         // Need to change args to run wrapper using command like 'TestScaffold Virtual <app-name>'
         String mainWrapper = System.getProperty("main.wrapper");
         if (mainWrapper != null && !argInfo.targetAppCommandLine.isEmpty()) {
+            argInfo.targetVMArgs += "-Dmain.wrapper=" + mainWrapper;
             argInfo.targetAppCommandLine = TestScaffold.class.getName() + ' '
                     + mainWrapper + ' ' + argInfo.targetAppCommandLine;
         } else if ("true".equals(System.getProperty("test.enable.preview"))) {