diff --git a/test/hotspot/jtreg/compiler/c2/irTests/stable/StableFlatArrayTest.java b/test/hotspot/jtreg/compiler/c2/irTests/stable/StableFlatArrayTest.java
index 39255f3ebe9..aa56ba3c3ab 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/stable/StableFlatArrayTest.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/stable/StableFlatArrayTest.java
@@ -27,12 +27,10 @@
  * @summary Check stable flat array field folding
  * @library /test/lib /
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64")
- * @build jdk.test.whitebox.WhiteBox
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.c2.irTests.stable.StableFlatArrayTest
+ * @run driver ${test.main.class}
  */
 
 package compiler.c2.irTests.stable;
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestAcmpFastPath.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestAcmpFastPath.java
index 34df0221ac3..ff8c3f69263 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestAcmpFastPath.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestAcmpFastPath.java
@@ -29,7 +29,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -40,7 +40,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -51,7 +51,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -62,7 +62,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 3
+ * @run driver ${test.main.class} 3
  */
 
 /*
@@ -73,7 +73,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -84,7 +84,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -95,7 +95,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 6
+ * @run driver ${test.main.class} 6
  */
 
 /*
@@ -106,7 +106,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 7
+ * @run driver ${test.main.class} 7
  */
 
 /*
@@ -117,7 +117,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 8
+ * @run driver ${test.main.class} 8
  */
 
 /*
@@ -128,7 +128,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 9
+ * @run driver ${test.main.class} 9
  */
 
 /*
@@ -139,7 +139,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 10
+ * @run driver ${test.main.class} 10
  */
 
 /*
@@ -150,7 +150,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 11
+ * @run driver ${test.main.class} 11
  */
 
 /*
@@ -161,7 +161,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 12
+ * @run driver ${test.main.class} 12
  */
 
 /*
@@ -172,7 +172,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main ${test.main.class} 13
+ * @run driver ${test.main.class} 13
  */
 
 package compiler.valhalla.inlinetypes;
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestAllocationMergeAndFolding.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestAllocationMergeAndFolding.java
index 700e34f045b..f6d8997bf59 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestAllocationMergeAndFolding.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestAllocationMergeAndFolding.java
@@ -27,7 +27,7 @@
  * @summary Test that removing allocation merges of non-value and value object at EA is working properly.
  * @library /test/lib /
  * @enablePreview
- * @run main compiler.valhalla.inlinetypes.TestAllocationMergeAndFolding 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -36,7 +36,7 @@
  * @summary Test that removing allocation merges of non-value and value object at EA is working properly.
  * @library /test/lib /
  * @enablePreview
- * @run main compiler.valhalla.inlinetypes.TestAllocationMergeAndFolding 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -45,7 +45,7 @@
  * @summary Test that removing allocation merges of non-value and value object at EA is working properly.
  * @library /test/lib /
  * @enablePreview
- * @run main compiler.valhalla.inlinetypes.TestAllocationMergeAndFolding 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -54,7 +54,7 @@
  * @summary Test that removing allocation merges of non-value and value object at EA is working properly.
  * @library /test/lib /
  * @enablePreview
- * @run main compiler.valhalla.inlinetypes.TestAllocationMergeAndFolding 3
+ * @run driver ${test.main.class} 3
  */
 
 /*
@@ -63,7 +63,7 @@
  * @summary Test that removing allocation merges of non-value and value object at EA is working properly.
  * @library /test/lib /
  * @enablePreview
- * @run main compiler.valhalla.inlinetypes.TestAllocationMergeAndFolding 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -72,7 +72,7 @@
  * @summary Test that removing allocation merges of non-value and value object at EA is working properly.
  * @library /test/lib /
  * @enablePreview
- * @run main compiler.valhalla.inlinetypes.TestAllocationMergeAndFolding 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -81,7 +81,7 @@
  * @summary Test that removing allocation merges of non-value and value object at EA is working properly.
  * @library /test/lib /
  * @enablePreview
- * @run main compiler.valhalla.inlinetypes.TestAllocationMergeAndFolding 6
+ * @run driver ${test.main.class} 6
  */
 
 /*
@@ -90,7 +90,7 @@
  * @summary Test that removing allocation merges of non-value and value object at EA is working properly.
  * @library /test/lib /
  * @enablePreview
- * @run main compiler.valhalla.inlinetypes.TestAllocationMergeAndFolding 7
+ * @run driver ${test.main.class} 7
  */
 
 /*
@@ -99,7 +99,7 @@
  * @summary Test that removing allocation merges of non-value and value object at EA is working properly.
  * @library /test/lib /
  * @enablePreview
- * @run main compiler.valhalla.inlinetypes.TestAllocationMergeAndFolding 8
+ * @run driver ${test.main.class} 8
  */
 package compiler.valhalla.inlinetypes;
 
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestArrays.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestArrays.java
index c6f2220fa74..0523777d4ad 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestArrays.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestArrays.java
@@ -65,7 +65,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @run main compiler.valhalla.inlinetypes.TestArrays 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -77,7 +77,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @run main compiler.valhalla.inlinetypes.TestArrays 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -89,7 +89,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @run main compiler.valhalla.inlinetypes.TestArrays 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -101,7 +101,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @run main compiler.valhalla.inlinetypes.TestArrays 3
+ * @run driver ${test.main.class} 3
  */
 
 /*
@@ -113,7 +113,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @run main compiler.valhalla.inlinetypes.TestArrays 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -125,7 +125,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @run main compiler.valhalla.inlinetypes.TestArrays 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -137,7 +137,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @run main compiler.valhalla.inlinetypes.TestArrays 6
+ * @run driver ${test.main.class} 6
  */
 
 @ForceCompileClassInitializer
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestBasicFunctionality.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestBasicFunctionality.java
index 3f039478084..ebab0a1052b 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestBasicFunctionality.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestBasicFunctionality.java
@@ -54,7 +54,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestBasicFunctionality 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -67,7 +67,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestBasicFunctionality 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -80,7 +80,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestBasicFunctionality 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -93,7 +93,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestBasicFunctionality 3
+ * @run driver ${test.main.class} 3
  */
 
 /*
@@ -106,7 +106,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestBasicFunctionality 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -119,7 +119,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestBasicFunctionality 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -132,7 +132,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestBasicFunctionality 6
+ * @run driver ${test.main.class} 6
  */
 
 @ForceCompileClassInitializer
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestC1.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestC1.java
index 203b8eea4fb..a92376875bf 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestC1.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestC1.java
@@ -45,7 +45,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main/timeout=300 compiler.valhalla.inlinetypes.TestC1
+ * @run driver/timeout=300 ${test.main.class}
  */
 
 public class TestC1 {
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestCallingConvention.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestCallingConvention.java
index a5927bd6899..7e38e3e0092 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestCallingConvention.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestCallingConvention.java
@@ -52,12 +52,10 @@
  * @summary Test value class calling convention optimizations.
  * @library /test/lib /
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @build jdk.test.whitebox.WhiteBox
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestCallingConvention 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -66,12 +64,10 @@
  * @summary Test value class calling convention optimizations.
  * @library /test/lib /
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @build jdk.test.whitebox.WhiteBox
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestCallingConvention 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -80,12 +76,10 @@
  * @summary Test value class calling convention optimizations.
  * @library /test/lib /
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @build jdk.test.whitebox.WhiteBox
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestCallingConvention 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -94,12 +88,10 @@
  * @summary Test value class calling convention optimizations.
  * @library /test/lib /
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @build jdk.test.whitebox.WhiteBox
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestCallingConvention 3
+ * @run driver ${test.main.class} 3
  */
 
 /*
@@ -108,12 +100,10 @@
  * @summary Test value class calling convention optimizations.
  * @library /test/lib /
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @build jdk.test.whitebox.WhiteBox
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestCallingConvention 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -122,12 +112,10 @@
  * @summary Test value class calling convention optimizations.
  * @library /test/lib /
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @build jdk.test.whitebox.WhiteBox
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestCallingConvention 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -136,19 +124,15 @@
  * @summary Test value class calling convention optimizations.
  * @library /test/lib /
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64" | os.simpleArch == "riscv64")
- * @build jdk.test.whitebox.WhiteBox
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestCallingConvention 6
+ * @run driver ${test.main.class} 6
  */
 
 @ForceCompileClassInitializer
 public class TestCallingConvention {
 
-    private final static WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
-
     static {
         try {
             Class<?> clazz = TestCallingConvention.class;
@@ -1422,17 +1406,16 @@ public void test56_verifier(RunInfo info) throws Throwable {
         }
     }
 
-    static boolean expectedUseArrayFlattening = WHITE_BOX.getBooleanVMFlag("UseArrayFlattening");
-
-    // Test value class return from native method
+    // Test value class (Boolean) return from native method
     @Test
-    public boolean test57() {
-        return WHITE_BOX.getBooleanVMFlag("UseArrayFlattening");
+    public boolean test57(WhiteBox wb) {
+        return wb.getBooleanVMFlag("UseArrayFlattening");
     }
 
     @Run(test = "test57")
     public void test57_verifier() {
-        Asserts.assertEQ(test57(), expectedUseArrayFlattening);
+        WhiteBox wb = WhiteBox.getWhiteBox();
+        Asserts.assertEQ(test57(wb), wb.getBooleanVMFlag("UseArrayFlattening"));
     }
 
     // Test abstract value class with flat fields
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestCallingConventionC1.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestCallingConventionC1.java
index 19949f3fc1b..31387bb7eb7 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestCallingConventionC1.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestCallingConventionC1.java
@@ -42,7 +42,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main/timeout=300 compiler.valhalla.inlinetypes.TestCallingConventionC1
+ * @run driver/timeout=300 ${test.main.class}
  */
 
 @ForceCompileClassInitializer
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestEliminateAutoBox.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestEliminateAutoBox.java
index 21141e25b85..fa1d3fd00cf 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestEliminateAutoBox.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestEliminateAutoBox.java
@@ -33,7 +33,7 @@
  * @library /test/lib /
  * @requires vm.compiler2.enabled & vm.flagless
  * @enablePreview
- * @run main compiler.valhalla.inlinetypes.TestEliminateAutoBox
+ * @run driver ${test.main.class}
  */
 public class TestEliminateAutoBox {
     private static final int INT_VALUE = 1000;
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestFlatInArraysFolding.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestFlatInArraysFolding.java
index a8418caa5a8..d6716ba5f50 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestFlatInArraysFolding.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestFlatInArraysFolding.java
@@ -32,7 +32,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestFlatInArraysFolding serial
+ * @run driver ${test.main.class} serial
  */
 
 /*
@@ -45,7 +45,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestFlatInArraysFolding
+ * @run driver ${test.main.class}
  */
 
 package compiler.valhalla.inlinetypes;
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestGetfieldChains.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestGetfieldChains.java
index a12eb56cbb9..7afc7152d4d 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestGetfieldChains.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestGetfieldChains.java
@@ -44,7 +44,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @compile GetfieldChains.jcod
- * @run main/timeout=300 compiler.valhalla.inlinetypes.TestGetfieldChains
+ * @run driver/timeout=300 ${test.main.class}
  */
 
 @LooselyConsistentValue
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestInlineFieldNonFlattened.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestInlineFieldNonFlattened.java
index 9b55dac5c6a..7749e0df949 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestInlineFieldNonFlattened.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestInlineFieldNonFlattened.java
@@ -40,10 +40,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions
- *                   -XX:-TieredCompilation
- *                   -XX:-UseFieldFlattening
- *                   compiler.valhalla.inlinetypes.TestInlineFieldNonFlattened
+ * @run driver ${test.main.class}
  */
 
 public class TestInlineFieldNonFlattened {
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestIntrinsics.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestIntrinsics.java
index b37d79fc7b3..8a16bd5b11c 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestIntrinsics.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestIntrinsics.java
@@ -55,9 +55,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestIntrinsics 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -70,9 +68,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestIntrinsics 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -85,9 +81,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestIntrinsics 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -100,9 +94,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestIntrinsics 3
+ * @run driver ${test.main.class} 3
  */
 
 /*
@@ -115,9 +107,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestIntrinsics 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -130,9 +120,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestIntrinsics 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -145,18 +133,19 @@
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI compiler.valhalla.inlinetypes.TestIntrinsics 6
+ * @run driver ${test.main.class} 6
  */
 
 @ForceCompileClassInitializer
 public class TestIntrinsics {
 
-    private static final WhiteBox WHITEBOX = WhiteBox.getWhiteBox();
-    private static final boolean UseArrayFlattening = WHITEBOX.getBooleanVMFlag("UseArrayFlattening");
-    private static final boolean UseFieldFlattening = WHITEBOX.getBooleanVMFlag("UseFieldFlattening");
-    private static final boolean PreloadClasses = WHITEBOX.getBooleanVMFlag("PreloadClasses");
+    // Make sure the WhiteBox API is only loaded in the Test VM such that we can run this test in driver mode
+    static class Flags {
+        private static final WhiteBox WHITEBOX = WhiteBox.getWhiteBox();
+        private static final boolean UseArrayFlattening = WHITEBOX.getBooleanVMFlag("UseArrayFlattening");
+        private static final boolean UseFieldFlattening = WHITEBOX.getBooleanVMFlag("UseFieldFlattening");
+        private static final boolean PreloadClasses = WHITEBOX.getBooleanVMFlag("PreloadClasses");
+    }
 
     public TestIntrinsics() {
         test24_vt = MyValue1.createWithFieldsInline(rI, rL);
@@ -1280,10 +1269,10 @@ static SmallValue createWithFieldsInline(int x, long y) {
     @Test
     public boolean test63(SmallValue oldVal, SmallValue newVal) {
         if (TEST63_VT_FLATTENED) {
-            Asserts.assertTrue(UseFieldFlattening && PreloadClasses);
+            Asserts.assertTrue(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndSetFlatValue(this, TEST63_VT_OFFSET, TEST63_VT_LAYOUT, SmallValue.class, oldVal, newVal);
         } else {
-            Asserts.assertFalse(UseFieldFlattening && PreloadClasses);
+            Asserts.assertFalse(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndSetReference(this, TEST63_VT_OFFSET, oldVal, newVal);
         }
     }
@@ -1291,7 +1280,7 @@ public boolean test63(SmallValue oldVal, SmallValue newVal) {
     @Run(test = "test63")
     public void test63_verifier() {
         // Unsafe::compareAndSetFlatValue needs UseArrayFlattening.
-        if (UseFieldFlattening && !UseArrayFlattening) return;
+        if (Flags.UseFieldFlattening && !Flags.UseArrayFlattening) return;
         SmallValue vt = SmallValue.createWithFieldsInline(rI, rL);
         test63_vt = SmallValue.createDefaultInline();
 
@@ -1333,10 +1322,10 @@ public void test63_verifier() {
     @Test
     public boolean test64(SmallValue[] arr, SmallValue oldVal, SmallValue newVal) {
         if (TEST64_FLATTENED_ARRAY) {
-            Asserts.assertTrue(UseArrayFlattening);
+            Asserts.assertTrue(Flags.UseArrayFlattening);
             return U.compareAndSetFlatValue(arr, TEST64_BASE_OFFSET + TEST64_INDEX_SCALE, TEST64_LAYOUT, SmallValue.class, oldVal, newVal);
         } else {
-            Asserts.assertFalse(UseArrayFlattening);
+            Asserts.assertFalse(Flags.UseArrayFlattening);
             return U.compareAndSetReference(arr, TEST64_BASE_OFFSET + TEST64_INDEX_SCALE, oldVal, newVal);
         }
     }
@@ -1366,10 +1355,10 @@ public void test64_verifier() {
     @Test
     public boolean test65(Object o, Object oldVal, SmallValue newVal) {
         if (TEST63_VT_FLATTENED) {
-            Asserts.assertTrue(UseFieldFlattening && PreloadClasses);
+            Asserts.assertTrue(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndSetFlatValue(o, TEST63_VT_OFFSET, TEST63_VT_LAYOUT, SmallValue.class, oldVal, newVal);
         } else {
-            Asserts.assertFalse(UseFieldFlattening && PreloadClasses);
+            Asserts.assertFalse(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndSetReference(o, TEST63_VT_OFFSET, oldVal, newVal);
         }
     }
@@ -1377,7 +1366,7 @@ public boolean test65(Object o, Object oldVal, SmallValue newVal) {
     @Run(test = "test65")
     public void test65_verifier() {
         // Unsafe::compareAndSetFlatValue needs UseArrayFlattening.
-        if (UseFieldFlattening && !UseArrayFlattening) return;
+        if (Flags.UseFieldFlattening && !Flags.UseArrayFlattening) return;
         SmallValue vt = SmallValue.createWithFieldsInline(rI, rL);
         test63_vt = SmallValue.createDefaultInline();
 
@@ -1394,10 +1383,10 @@ public void test65_verifier() {
     @Test
     public boolean test66(Object oldVal, Object newVal) {
         if (TEST63_VT_FLATTENED) {
-            Asserts.assertTrue(UseFieldFlattening && PreloadClasses);
+            Asserts.assertTrue(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndSetFlatValue(this, TEST63_VT_OFFSET, TEST63_VT_LAYOUT, SmallValue.class, oldVal, newVal);
         } else {
-            Asserts.assertFalse(UseFieldFlattening && PreloadClasses);
+            Asserts.assertFalse(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndSetReference(this, TEST63_VT_OFFSET, oldVal, newVal);
         }
     }
@@ -1405,7 +1394,7 @@ public boolean test66(Object oldVal, Object newVal) {
     @Run(test = "test66")
     public void test66_verifier() {
         // Unsafe::compareAndSetFlatValue needs UseArrayFlattening.
-        if (UseFieldFlattening && !UseArrayFlattening) return;
+        if (Flags.UseFieldFlattening && !Flags.UseArrayFlattening) return;
         SmallValue vt = SmallValue.createWithFieldsInline(rI, rL);
         test63_vt = SmallValue.createDefaultInline();
 
@@ -1422,10 +1411,10 @@ public void test66_verifier() {
     @Test
     public Object test67(SmallValue oldVal, SmallValue newVal) {
         if (TEST63_VT_FLATTENED) {
-            Asserts.assertTrue(UseFieldFlattening && PreloadClasses);
+            Asserts.assertTrue(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndExchangeFlatValue(this, TEST63_VT_OFFSET, TEST63_VT_LAYOUT, SmallValue.class, oldVal, newVal);
         } else {
-            Asserts.assertFalse(UseFieldFlattening && PreloadClasses);
+            Asserts.assertFalse(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndExchangeReference(this, TEST63_VT_OFFSET, oldVal, newVal);
         }
     }
@@ -1433,7 +1422,7 @@ public Object test67(SmallValue oldVal, SmallValue newVal) {
     @Run(test = "test67")
     public void test67_verifier() {
         // Unsafe::compareAndExchangeFlatValue needs UseArrayFlattening.
-        if (UseFieldFlattening && !UseArrayFlattening) return;
+        if (Flags.UseFieldFlattening && !Flags.UseArrayFlattening) return;
         SmallValue vt = SmallValue.createWithFieldsInline(rI, rL);
         SmallValue oldVal = SmallValue.createDefaultInline();
         test63_vt = oldVal;
@@ -1457,10 +1446,10 @@ public void test67_verifier() {
     @Test
     public Object test68(SmallValue[] arr, SmallValue oldVal, Object newVal) {
         if (TEST64_FLATTENED_ARRAY) {
-            Asserts.assertTrue(UseArrayFlattening);
+            Asserts.assertTrue(Flags.UseArrayFlattening);
             return U.compareAndExchangeFlatValue(arr, TEST64_BASE_OFFSET + TEST64_INDEX_SCALE, TEST64_LAYOUT, SmallValue.class, oldVal, newVal);
         } else {
-            Asserts.assertFalse(UseArrayFlattening);
+            Asserts.assertFalse(Flags.UseArrayFlattening);
             return U.compareAndExchangeReference(arr, TEST64_BASE_OFFSET + TEST64_INDEX_SCALE, oldVal, newVal);
         }
     }
@@ -1490,10 +1479,10 @@ public void test68_verifier() {
     @Test
     public Object test69(Object o, Object oldVal, SmallValue newVal) {
         if (TEST63_VT_FLATTENED) {
-            Asserts.assertTrue(UseFieldFlattening && PreloadClasses);
+            Asserts.assertTrue(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndExchangeFlatValue(o, TEST63_VT_OFFSET, TEST63_VT_LAYOUT, SmallValue.class, oldVal, newVal);
         } else {
-            Asserts.assertFalse(UseFieldFlattening && PreloadClasses);
+            Asserts.assertFalse(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndExchangeReference(o, TEST63_VT_OFFSET, oldVal, newVal);
         }
     }
@@ -1501,7 +1490,7 @@ public Object test69(Object o, Object oldVal, SmallValue newVal) {
     @Run(test = "test69")
     public void test69_verifier() {
         // Unsafe::compareAndExchangeFlatValue needs UseArrayFlattening.
-        if (UseFieldFlattening && !UseArrayFlattening) return;
+        if (Flags.UseFieldFlattening && !Flags.UseArrayFlattening) return;
         SmallValue vt = SmallValue.createWithFieldsInline(rI, rL);
         SmallValue oldVal = SmallValue.createDefaultInline();
         test63_vt = oldVal;
@@ -1519,10 +1508,10 @@ public void test69_verifier() {
     @Test
     public Object test70(Object oldVal, Object newVal) {
         if (TEST63_VT_FLATTENED) {
-            Asserts.assertTrue(UseFieldFlattening && PreloadClasses);
+            Asserts.assertTrue(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndExchangeFlatValue(this, TEST63_VT_OFFSET, TEST63_VT_LAYOUT, SmallValue.class, oldVal, newVal);
         } else {
-            Asserts.assertFalse(UseFieldFlattening && PreloadClasses);
+            Asserts.assertFalse(Flags.UseFieldFlattening && Flags.PreloadClasses);
             return U.compareAndExchangeReference(this, TEST63_VT_OFFSET, oldVal, newVal);
         }
     }
@@ -1530,7 +1519,7 @@ public Object test70(Object oldVal, Object newVal) {
     @Run(test = "test70")
     public void test70_verifier() {
         // Unsafe::compareAndExchangeFlatValue needs UseArrayFlattening.
-        if (UseFieldFlattening && !UseArrayFlattening) return;
+        if (Flags.UseFieldFlattening && !Flags.UseArrayFlattening) return;
         SmallValue vt = SmallValue.createWithFieldsInline(rI, rL);
         SmallValue oldVal = SmallValue.createDefaultInline();
         test63_vt = oldVal;
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestJNICalls.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestJNICalls.java
index 6a094da067b..c4a41f5e5d6 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestJNICalls.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestJNICalls.java
@@ -38,7 +38,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestJNICalls 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -50,7 +50,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestJNICalls 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -62,7 +62,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestJNICalls 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -74,7 +74,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestJNICalls 3
+ * @run driver ${test.main.class} 3
  */
 
 /*
@@ -86,7 +86,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestJNICalls 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -98,7 +98,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestJNICalls 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -110,7 +110,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestJNICalls 6
+ * @run driver ${test.main.class} 6
  */
 
 @ForceCompileClassInitializer
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestLWorld.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestLWorld.java
index 87e8049fa6e..71ece91bd46 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestLWorld.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestLWorld.java
@@ -73,7 +73,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestLWorld 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -86,7 +86,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestLWorld 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -99,7 +99,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestLWorld 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -112,7 +112,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestLWorld 3
+ * @run driver ${test.main.class} 3
  */
 
 /*
@@ -125,7 +125,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestLWorld 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -139,7 +139,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestLWorld 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -153,7 +153,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestLWorld 6
+ * @run driver ${test.main.class} 6
  */
 
 public class TestLWorld {
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestLWorldProfiling.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestLWorldProfiling.java
index 651ad0a923c..3ff5a0c86f5 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestLWorldProfiling.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestLWorldProfiling.java
@@ -47,7 +47,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main/timeout=300 compiler.valhalla.inlinetypes.TestLWorldProfiling
+ * @run driver/timeout=300 ${test.main.class}
  */
 
 @ForceCompileClassInitializer
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestMethodHandles.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestMethodHandles.java
index 4b22428b5cf..9ad94fc5b72 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestMethodHandles.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestMethodHandles.java
@@ -53,7 +53,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestMethodHandles 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -67,7 +67,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestMethodHandles 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -81,7 +81,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestMethodHandles 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -95,7 +95,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestMethodHandles 3
+ * @run driver ${test.main.class} 3
  */
 
 /*
@@ -109,7 +109,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestMethodHandles 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -123,7 +123,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestMethodHandles 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -137,7 +137,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestMethodHandles 6
+ * @run driver ${test.main.class} 6
  */
 
 @ForceCompileClassInitializer
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNewAcmp.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNewAcmp.java
index 0d1177e9215..be860a2c69d 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNewAcmp.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNewAcmp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1709,16 +1709,7 @@ public boolean cmpSometimesEqual2(Object a) {
         return a != a;
     }
 
-    static int get_full_opt_level() {
-        int n = (int)TieredStopAtLevel;
-        if (n >= 4) {
-            n = 4;
-        }
-        return n;
-    }
     protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
-    protected static final long TieredStopAtLevel = (Long)WHITE_BOX.getVMFlag("TieredStopAtLevel");
-    protected static final int COMP_LEVEL_FULL_OPTIMIZATION = get_full_opt_level();
 
     public void runTest(Method m, Object[] args, int warmup, int nullMode, boolean[][] equalities) throws Exception {
         Class<?>[] parameterTypes = m.getParameterTypes();
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNullableArrays.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNullableArrays.java
index d533d261e76..4faf637f99f 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNullableArrays.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNullableArrays.java
@@ -55,7 +55,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestNullableArrays 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -67,7 +67,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestNullableArrays 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -79,7 +79,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestNullableArrays 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -91,7 +91,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestNullableArrays 3
+ * @run driver ${test.main.class} 3
  */
 
 /*
@@ -103,7 +103,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestNullableArrays 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -115,7 +115,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestNullableArrays 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -127,7 +127,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestNullableArrays 6
+ * @run driver ${test.main.class} 6
  */
 
 @ForceCompileClassInitializer
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNullableInlineTypes.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNullableInlineTypes.java
index 3492d99a8f8..7f32ef43695 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNullableInlineTypes.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestNullableInlineTypes.java
@@ -60,7 +60,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestNullableInlineTypes 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -74,7 +74,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestNullableInlineTypes 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -88,7 +88,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestNullableInlineTypes 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -102,7 +102,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main/othervm/timeout=300 compiler.valhalla.inlinetypes.TestNullableInlineTypes 3
+ * @run driver/timeout=300 ${test.main.class} 3
  */
 
 /*
@@ -116,7 +116,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestNullableInlineTypes 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -130,7 +130,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestNullableInlineTypes 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -144,7 +144,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @build test.java.lang.invoke.lib.InstructionHelper
- * @run main compiler.valhalla.inlinetypes.TestNullableInlineTypes 6
+ * @run driver ${test.main.class} 6
  */
 
 @ForceCompileClassInitializer
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestOnStackReplacement.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestOnStackReplacement.java
index d9dfa8b35aa..e6b647b6dfb 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestOnStackReplacement.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestOnStackReplacement.java
@@ -45,7 +45,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestOnStackReplacement 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -57,7 +57,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestOnStackReplacement 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -69,7 +69,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestOnStackReplacement 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -81,7 +81,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main/timeout=240 compiler.valhalla.inlinetypes.TestOnStackReplacement 3
+ * @run driver/timeout=240 ${test.main.class} 3
  */
 
 /*
@@ -93,7 +93,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestOnStackReplacement 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -105,7 +105,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestOnStackReplacement 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -117,7 +117,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestOnStackReplacement 6
+ * @run driver ${test.main.class} 6
  */
 
 public class TestOnStackReplacement {
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestOptimizePtrCompare.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestOptimizePtrCompare.java
index 9990309cea7..3f5dca15f0f 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestOptimizePtrCompare.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestOptimizePtrCompare.java
@@ -28,7 +28,7 @@
  * @library /test/lib /
  * @enablePreview
  * @requires (os.simpleArch == "x64" | os.simpleArch == "aarch64")
- * @run main ${test.main.class}
+ * @run driver ${test.main.class}
  */
 
 package compiler.valhalla.inlinetypes;
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestStrictFinalExitMemBar.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestStrictFinalExitMemBar.java
index cffb8717640..2078f3d65f1 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestStrictFinalExitMemBar.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestStrictFinalExitMemBar.java
@@ -32,7 +32,7 @@
  * @run driver jdk.test.lib.helpers.StrictProcessor
  *             compiler.valhalla.inlinetypes.TestStrictFinalExitMemBar$StrictFinalHolder
  *             compiler.valhalla.inlinetypes.TestStrictFinalExitMemBar$StrictNonFinalHolder
- * @run main ${test.main.class}
+ * @run driver ${test.main.class}
  */
 
 package compiler.valhalla.inlinetypes;
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestUnloadedInlineTypeField.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestUnloadedInlineTypeField.java
index 63c55ab6e7c..f7fc75791d8 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestUnloadedInlineTypeField.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestUnloadedInlineTypeField.java
@@ -42,7 +42,7 @@
  *          java.base/jdk.internal.vm.annotation
  * @compile hack/GetUnresolvedInlineFieldWrongSignature.java
  * @compile TestUnloadedInlineTypeField.java
- * @run main/othervm/timeout=300 compiler.valhalla.inlinetypes.TestUnloadedInlineTypeField
+ * @run driver/timeout=300 ${test.main.class}
  */
 
 public class TestUnloadedInlineTypeField {
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestValueClasses.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestValueClasses.java
index a24a6be764a..7ab9f1b710b 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestValueClasses.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestValueClasses.java
@@ -46,7 +46,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestValueClasses 0
+ * @run driver ${test.main.class} 0
  */
 
 /*
@@ -58,7 +58,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestValueClasses 1
+ * @run driver ${test.main.class} 1
  */
 
 /*
@@ -70,7 +70,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestValueClasses 2
+ * @run driver ${test.main.class} 2
  */
 
 /*
@@ -82,7 +82,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestValueClasses 3
+ * @run driver ${test.main.class} 3
  */
 
 /*
@@ -94,7 +94,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestValueClasses 4
+ * @run driver ${test.main.class} 4
  */
 
 /*
@@ -106,7 +106,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestValueClasses 5
+ * @run driver ${test.main.class} 5
  */
 
 /*
@@ -118,7 +118,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main compiler.valhalla.inlinetypes.TestValueClasses 6
+ * @run driver ${test.main.class} 6
  */
 
 @ForceCompileClassInitializer
diff --git a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestValueRematDuringTypeSharpening.java b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestValueRematDuringTypeSharpening.java
index 0b8f5fef7e2..1664baaa5cf 100644
--- a/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestValueRematDuringTypeSharpening.java
+++ b/test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestValueRematDuringTypeSharpening.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
  * @library /test/lib /
  * @enablePreview
  * @modules java.base/jdk.internal.misc
- * @run main/timeout=300 compiler.valhalla.inlinetypes.TestValueRematDuringTypeSharpening
+ * @run driver/timeout=300 ${test.main.class}
  */
 
 abstract value class topValue {