--- old/test/hotspot/jtreg/runtime/BadObjectClass/BootstrapRedefine.java	2020-04-29 12:06:42.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/BadObjectClass/BootstrapRedefine.java	2020-04-29 12:06:42.000000000 -0700
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main BootstrapRedefine
+ * @run driver BootstrapRedefine
  */
 
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
--- old/test/hotspot/jtreg/runtime/BootClassAppendProp/BootClassPathAppend.java	2020-04-29 12:06:44.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/BootClassAppendProp/BootClassPathAppend.java	2020-04-29 12:06:44.000000000 -0700
@@ -27,6 +27,7 @@
  * @summary Uninitialized system property jdk.boot.class.path.append causes SIGSEGV
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
+ * @run driver BootClassPathAppend
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/BootstrapMethod/TestLambdaExceptionInInitializer.java	2020-04-29 12:06:46.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/BootstrapMethod/TestLambdaExceptionInInitializer.java	2020-04-29 12:06:46.000000000 -0700
@@ -27,7 +27,7 @@
  * @library /test/lib
  * @compile TestPkg/LambdaMetafactory.java
  * @compile TestPkg/Lambda.jasm
- * @run main TestLambdaExceptionInInitializer
+ * @run driver TestLambdaExceptionInInitializer
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java	2020-04-29 12:06:48.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java	2020-04-29 12:06:48.000000000 -0700
@@ -29,7 +29,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main CDSCompressedKPtrs
+ * @run driver CDSCompressedKPtrs
  */
 
 import jdk.test.lib.Platform;
--- old/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java	2020-04-29 12:06:50.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java	2020-04-29 12:06:50.000000000 -0700
@@ -29,7 +29,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main XShareAuto
+ * @run driver XShareAuto
  */
 
 import jdk.test.lib.Platform;
--- old/test/hotspot/jtreg/runtime/ClassFile/FormatCheckingTest.java	2020-04-29 12:06:52.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ClassFile/FormatCheckingTest.java	2020-04-29 12:06:51.000000000 -0700
@@ -29,7 +29,7 @@
  * @compile BadHelloWorld.jcod
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main FormatCheckingTest
+ * @run driver FormatCheckingTest
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- old/test/hotspot/jtreg/runtime/ClassFile/JsrRewriting.java	2020-04-29 12:06:54.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ClassFile/JsrRewriting.java	2020-04-29 12:06:54.000000000 -0700
@@ -37,7 +37,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.desktop
  *          java.management
- * @run main JsrRewriting
+ * @run driver JsrRewriting
  */
 
 import jdk.test.lib.JDKToolFinder;
--- old/test/hotspot/jtreg/runtime/ClassFile/OomWhileParsingRepeatedJsr.java	2020-04-29 12:06:56.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ClassFile/OomWhileParsingRepeatedJsr.java	2020-04-29 12:06:56.000000000 -0700
@@ -37,7 +37,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.desktop
  *          java.management
- * @run main OomWhileParsingRepeatedJsr
+ * @run driver OomWhileParsingRepeatedJsr
  */
 
 import jdk.test.lib.JDKToolFinder;
--- old/test/hotspot/jtreg/runtime/ClassFile/TestCheckedExceptions.java	2020-04-29 12:06:58.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ClassFile/TestCheckedExceptions.java	2020-04-29 12:06:58.000000000 -0700
@@ -31,7 +31,7 @@
  *          classes in method throws clauses.
  * @library /test/lib
  * @compile CheckedExceptions.jcod
- * @run main TestCheckedExceptions
+ * @run driver TestCheckedExceptions
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/CommandLine/BooleanFlagWithInvalidValue.java	2020-04-29 12:07:00.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/BooleanFlagWithInvalidValue.java	2020-04-29 12:07:00.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver BooleanFlagWithInvalidValue
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/CommandLine/CompilerConfigFileWarning.java	2020-04-29 12:07:02.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/CompilerConfigFileWarning.java	2020-04-29 12:07:02.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver CompilerConfigFileWarning
  */
 
 import java.io.PrintWriter;
--- old/test/hotspot/jtreg/runtime/CommandLine/ConfigFileParsing.java	2020-04-29 12:07:04.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/ConfigFileParsing.java	2020-04-29 12:07:04.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver ConfigFileParsing
  */
 
 import java.io.PrintWriter;
--- old/test/hotspot/jtreg/runtime/CommandLine/ConfigFileWarning.java	2020-04-29 12:07:06.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/ConfigFileWarning.java	2020-04-29 12:07:06.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver ConfigFileWarning
  */
 
 import java.io.PrintWriter;
--- old/test/hotspot/jtreg/runtime/CommandLine/DoubleFlagWithIntegerValue.java	2020-04-29 12:07:08.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/DoubleFlagWithIntegerValue.java	2020-04-29 12:07:07.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver DoubleFlagWithIntegerValue
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/CommandLine/FlagWithInvalidValue.java	2020-04-29 12:07:10.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/FlagWithInvalidValue.java	2020-04-29 12:07:09.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver FlagWithInvalidValue
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java	2020-04-29 12:07:11.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java	2020-04-29 12:07:11.000000000 -0700
@@ -33,7 +33,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main IgnoreUnrecognizedVMOptions
+ * @run driver IgnoreUnrecognizedVMOptions
  */
 public class IgnoreUnrecognizedVMOptions {
 
--- old/test/hotspot/jtreg/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java	2020-04-29 12:07:13.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java	2020-04-29 12:07:13.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver NonBooleanFlagWithInvalidBooleanPrefix
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/CommandLine/ObsoleteFlagErrorMessage.java	2020-04-29 12:07:15.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/ObsoleteFlagErrorMessage.java	2020-04-29 12:07:15.000000000 -0700
@@ -27,6 +27,7 @@
  * @summary Newly obsolete command line options should still give useful error messages when used improperly.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @run driver ObsoleteFlagErrorMessage
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java	2020-04-29 12:07:17.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java	2020-04-29 12:07:16.000000000 -0700
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.management
- * @run main TestJcmdOutput
+ * @run driver TestJcmdOutput
  */
 
 import jdk.test.lib.Asserts;
--- old/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java	2020-04-29 12:07:19.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java	2020-04-29 12:07:18.000000000 -0700
@@ -32,7 +32,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=1800 TestOptionsWithRanges 1 of 10
+ * @run driver/timeout=1800 TestOptionsWithRanges 1 of 10
  */
 /*
  * @test
@@ -43,7 +43,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=1800 TestOptionsWithRanges 2 of 10
+ * @run driver/timeout=1800 TestOptionsWithRanges 2 of 10
  */
 /*
  * @test
@@ -54,7 +54,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=1800 TestOptionsWithRanges 3 of 10
+ * @run driver/timeout=1800 TestOptionsWithRanges 3 of 10
  */
 /*
  * @test
@@ -65,7 +65,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=1800 TestOptionsWithRanges 4 of 10
+ * @run driver/timeout=1800 TestOptionsWithRanges 4 of 10
  */
 /*
  * @test
@@ -76,7 +76,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=1800 TestOptionsWithRanges 5 of 10
+ * @run driver/timeout=1800 TestOptionsWithRanges 5 of 10
  */
 /*
  * @test
@@ -87,7 +87,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=1800 TestOptionsWithRanges 6 of 10
+ * @run driver/timeout=1800 TestOptionsWithRanges 6 of 10
  */
 /*
  * @test
@@ -98,7 +98,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=1800 TestOptionsWithRanges 7 of 10
+ * @run driver/timeout=1800 TestOptionsWithRanges 7 of 10
  */
 /*
  * @test
@@ -109,7 +109,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=1800 TestOptionsWithRanges 8 of 10
+ * @run driver/timeout=1800 TestOptionsWithRanges 8 of 10
  */
 /*
  * @test
@@ -120,7 +120,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=1800 TestOptionsWithRanges 9 of 10
+ * @run driver/timeout=1800 TestOptionsWithRanges 9 of 10
  */
 /*
  * @test
@@ -131,7 +131,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=1800 TestOptionsWithRanges 10 of 10
+ * @run driver/timeout=1800 TestOptionsWithRanges 10 of 10
  */
 // --- end auto-generated
 
--- old/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges_generate.sh	2020-04-29 12:07:20.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges_generate.sh	2020-04-29 12:07:20.000000000 -0700
@@ -35,7 +35,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=1800 TestOptionsWithRanges $i of 10
+ * @run driver/timeout=1800 TestOptionsWithRanges $i of 10
  */
 EOF
 done
--- old/test/hotspot/jtreg/runtime/CommandLine/TestHexArguments.java	2020-04-29 12:07:22.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/TestHexArguments.java	2020-04-29 12:07:22.000000000 -0700
@@ -29,6 +29,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver TestHexArguments
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/CommandLine/TestLongUnrecognizedVMOption.java	2020-04-29 12:07:24.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/TestLongUnrecognizedVMOption.java	2020-04-29 12:07:24.000000000 -0700
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @modules java.management
- * @run main TestLongUnrecognizedVMOption
+ * @run driver TestLongUnrecognizedVMOption
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- old/test/hotspot/jtreg/runtime/CommandLine/TestVMOptions.java	2020-04-29 12:07:26.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/TestVMOptions.java	2020-04-29 12:07:25.000000000 -0700
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main TestVMOptions
+ * @run driver TestVMOptions
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/CommandLine/TraceExceptionsTest.java	2020-04-29 12:07:28.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/TraceExceptionsTest.java	2020-04-29 12:07:27.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver TraceExceptionsTest
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/CommandLine/UnrecognizedVMOption.java	2020-04-29 12:07:29.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/UnrecognizedVMOption.java	2020-04-29 12:07:29.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver UnrecognizedVMOption
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/CommandLine/VMAliasOptions.java	2020-04-29 12:07:31.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/VMAliasOptions.java	2020-04-29 12:07:31.000000000 -0700
@@ -31,6 +31,7 @@
  * @summary Test that various alias options correctly set the target options. See aliased_jvm_flags in arguments.cpp.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @run driver VMAliasOptions
  */
 public class VMAliasOptions {
 
--- old/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java	2020-04-29 12:07:33.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java	2020-04-29 12:07:32.000000000 -0700
@@ -31,6 +31,7 @@
  * @summary Test that various options are deprecated. See deprecated_jvm_flags in arguments.cpp.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @run driver VMDeprecatedOptions
  */
 public class VMDeprecatedOptions {
 
--- old/test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java	2020-04-29 12:07:35.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/VMOptionWarning.java	2020-04-29 12:07:34.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver VMOptionWarning
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java	2020-04-29 12:07:37.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java	2020-04-29 12:07:36.000000000 -0700
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @modules jdk.management
- * @run main TestVMOptionsFile
+ * @run driver TestVMOptionsFile
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java	2020-04-29 12:07:39.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CompressedOops/CompressedClassPointers.java	2020-04-29 12:07:38.000000000 -0700
@@ -29,7 +29,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main CompressedClassPointers
+ * @run driver CompressedClassPointers
  */
 
 import jdk.test.lib.Platform;
--- old/test/hotspot/jtreg/runtime/CompressedOops/CompressedKlassPointerAndOops.java	2020-04-29 12:07:41.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CompressedOops/CompressedKlassPointerAndOops.java	2020-04-29 12:07:40.000000000 -0700
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @requires vm.bits == 64
- * @run main CompressedKlassPointerAndOops
+ * @run driver CompressedKlassPointerAndOops
  */
 
 import jdk.test.lib.Platform;
--- old/test/hotspot/jtreg/runtime/CompressedOops/ObjectAlignment.java	2020-04-29 12:07:42.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/CompressedOops/ObjectAlignment.java	2020-04-29 12:07:42.000000000 -0700
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main ObjectAlignment
+ * @run driver ObjectAlignment
  */
 
 import jdk.test.lib.Platform;
--- old/test/hotspot/jtreg/runtime/Dictionary/CleanProtectionDomain.java	2020-04-29 12:07:44.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/Dictionary/CleanProtectionDomain.java	2020-04-29 12:07:44.000000000 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main CleanProtectionDomain
+ * @run driver CleanProtectionDomain
  */
 
 import java.security.ProtectionDomain;
--- old/test/hotspot/jtreg/runtime/Dictionary/ProtectionDomainCacheTest.java	2020-04-29 12:07:46.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/Dictionary/ProtectionDomainCacheTest.java	2020-04-29 12:07:46.000000000 -0700
@@ -31,7 +31,7 @@
  * @build jdk.test.lib.Utils
  *        jdk.test.lib.util.JarUtils
  * @build ClassForName ProtectionDomainCacheTest
- * @run main/othervm/policy=test.policy -Djava.security.manager ProtectionDomainCacheTest
+ * @run driver ProtectionDomainCacheTest
  */
 
 import java.net.URL;
--- old/test/hotspot/jtreg/runtime/EnclosingMethodAttr/EnclMethodAttr.java	2020-04-29 12:07:49.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/EnclosingMethodAttr/EnclMethodAttr.java	2020-04-29 12:07:48.000000000 -0700
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile EnclMethTest.jcod
- * @run main EnclMethodAttr
+ * @run driver EnclMethodAttr
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileOverwriteTest.java	2020-04-29 12:07:51.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileOverwriteTest.java	2020-04-29 12:07:50.000000000 -0700
@@ -31,6 +31,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @requires (vm.debug == true)
+ * @run driver ErrorFileOverwriteTest
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- old/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileRedirectTest.java	2020-04-29 12:07:53.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/ErrorFileRedirectTest.java	2020-04-29 12:07:52.000000000 -0700
@@ -30,6 +30,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @requires (vm.debug == true)
+ * @run driver ErrorFileRedirectTest
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- old/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java	2020-04-29 12:07:56.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java	2020-04-29 12:07:55.000000000 -0700
@@ -38,7 +38,7 @@
  * @summary Nested ThreadsListHandle info should be in error handling output.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+EnableThreadSMRStatistics NestedThreadsListHandleInErrorHandlingTest
+ * @run driver NestedThreadsListHandleInErrorHandlingTest
  */
 
 /*
--- old/test/hotspot/jtreg/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java	2020-04-29 12:07:58.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java	2020-04-29 12:07:57.000000000 -0700
@@ -38,6 +38,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @author Thomas Stuefe (SAP)
+ * @run driver SafeFetchInErrorHandlingTest
  */
 
 public class SafeFetchInErrorHandlingTest {
--- old/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java	2020-04-29 12:08:00.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/SecondaryErrorTest.java	2020-04-29 12:07:59.000000000 -0700
@@ -30,6 +30,7 @@
  * @author Thomas Stuefe (SAP)
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver SecondaryErrorTest
  */
 
 import java.io.BufferedReader;
--- old/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java	2020-04-29 12:08:02.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/ShowRegistersOnAssertTest.java	2020-04-29 12:08:01.000000000 -0700
@@ -31,6 +31,7 @@
  * @author Thomas Stuefe (SAP)
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver ShowRegistersOnAssertTest
  */
 
 // Note: this test can only run on debug since it relies on VMError::controlled_crash() which
--- old/test/hotspot/jtreg/runtime/ErrorHandling/TestOnError.java	2020-04-29 12:08:04.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/TestOnError.java	2020-04-29 12:08:03.000000000 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @requires vm.debug
- * @run main TestOnError
+ * @run driver TestOnError
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/ErrorHandling/TestOnOutOfMemoryError.java	2020-04-29 12:08:06.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/TestOnOutOfMemoryError.java	2020-04-29 12:08:05.000000000 -0700
@@ -26,7 +26,7 @@
  * @summary Test using single and multiple -XX:OnOutOfMemoryError=<cmd>
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
- * @run main TestOnOutOfMemoryError
+ * @run driver TestOnOutOfMemoryError
  * @bug 8078470 8177522
  */
 
--- old/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java	2020-04-29 12:08:08.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/ThreadsListHandleInErrorHandlingTest.java	2020-04-29 12:08:07.000000000 -0700
@@ -38,7 +38,7 @@
  * @summary ThreadsListHandle info should be in error handling output.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+EnableThreadSMRStatistics ThreadsListHandleInErrorHandlingTest
+ * @run driver ThreadsListHandleInErrorHandlingTest
  */
 
 /*
--- old/test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java	2020-04-29 12:08:10.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java	2020-04-29 12:08:10.000000000 -0700
@@ -38,6 +38,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @requires (vm.debug == true) & (os.family != "windows")
+ * @run driver TimeoutInErrorHandlingTest
  * @author Thomas Stuefe (SAP)
  */
 
--- old/test/hotspot/jtreg/runtime/ErrorHandling/VeryEarlyAssertTest.java	2020-04-29 12:08:13.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/VeryEarlyAssertTest.java	2020-04-29 12:08:12.000000000 -0700
@@ -31,6 +31,7 @@
  * @modules java.base/jdk.internal.misc
  * @requires (vm.debug == true)
  * @requires os.family == "linux"
+ * @run driver VeryEarlyAssertTest
  */
 
 import java.io.BufferedReader;
--- old/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java	2020-04-29 12:08:15.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/InvocationTests/invocationC1Tests.java	2020-04-29 12:08:15.000000000 -0700
@@ -36,7 +36,7 @@
  *          invokevirtual/Checker.java invokevirtual/ClassGenerator.java invokevirtual/Generator.java
  *          invokeinterface/Checker.java invokeinterface/ClassGenerator.java invokeinterface/Generator.java
  *
- * @run main/othervm/timeout=1800 invocationC1Tests
+ * @run driver/timeout=1800 invocationC1Tests
  */
 
 import jdk.test.lib.process.ProcessTools;
@@ -45,7 +45,7 @@
 
 public class invocationC1Tests {
 
-    public static void runTest(String whichTests, String classFileVersion) throws Exception {
+    public static void runTest(String whichTests, String classFileVersion) throws Throwable {
         System.out.println("\nC1 invocation tests, Tests: " + whichTests +
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(false, "-Xmx128M",
@@ -66,7 +66,8 @@
             System.out.println(
                 "\nAlso note that passing --dump to invoke*.Generator will" +
                 " dump the generated classes (for debugging purposes).\n");
-            System.exit(1);
+
+            throw e;
         }
     }
 
--- old/test/hotspot/jtreg/runtime/InvocationTests/invocationGraalTests.java	2020-04-29 12:08:17.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/InvocationTests/invocationGraalTests.java	2020-04-29 12:08:17.000000000 -0700
@@ -37,7 +37,7 @@
  *          invokevirtual/Checker.java invokevirtual/ClassGenerator.java invokevirtual/Generator.java
  *          invokeinterface/Checker.java invokeinterface/ClassGenerator.java invokeinterface/Generator.java
  *
- * @run main/othervm/timeout=1800 invocationGraalTests
+ * @run driver/timeout=1800 invocationGraalTests
  */
 
 import jdk.test.lib.process.ProcessTools;
@@ -46,7 +46,7 @@
 
 public class invocationGraalTests {
 
-    public static void runTest(String whichTests, String classFileVersion) throws Exception {
+    public static void runTest(String whichTests, String classFileVersion) throws Throwable {
         System.out.println("\nGraal invocation tests, Tests: " + whichTests +
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(false, "-Xmx128M",
@@ -67,7 +67,8 @@
             System.out.println(
                 "\nAlso note that passing --dump to invoke*.Generator will" +
                 " dump the generated classes (for debugging purposes).\n");
-            System.exit(1);
+
+            throw e;
         }
     }
 
--- old/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java	2020-04-29 12:08:20.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/InvocationTests/invokeinterfaceTests.java	2020-04-29 12:08:19.000000000 -0700
@@ -35,7 +35,7 @@
  * @compile invokeinterface/Checker.java invokeinterface/ClassGenerator.java
  *          invokeinterface/Generator.java
  *
- * @run main/othervm/timeout=1800 invokeinterfaceTests
+ * @run driver/timeout=1800 invokeinterfaceTests
  */
 
 import jdk.test.lib.process.ProcessTools;
@@ -44,7 +44,7 @@
 
 public class invokeinterfaceTests {
 
-    public static void runTest(String classFileVersion, String option) throws Exception {
+    public static void runTest(String classFileVersion, String option) throws Throwable {
         System.out.println("\ninvokeinterface invocation tests, option: " + option +
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(false, "-Xmx128M", option,
@@ -65,7 +65,7 @@
                 "\nAlso note that passing --dump to invokeinterface.Generator will" +
                 " dump the generated classes (for debugging purposes).\n");
 
-            System.exit(1);
+            throw e;
         }
     }
 
--- old/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java	2020-04-29 12:08:22.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/InvocationTests/invokespecialTests.java	2020-04-29 12:08:21.000000000 -0700
@@ -34,7 +34,7 @@
  *          shared/ByteArrayClassLoader.java shared/Checker.java shared/GenericClassGenerator.java
  * @compile invokespecial/Checker.java invokespecial/ClassGenerator.java invokespecial/Generator.java
  *
- * @run main/othervm/timeout=1800 invokespecialTests
+ * @run driver/timeout=1800 invokespecialTests
  */
 
 import jdk.test.lib.process.ProcessTools;
@@ -43,7 +43,7 @@
 
 public class invokespecialTests {
 
-    public static void runTest(String classFileVersion, String option) throws Exception {
+    public static void runTest(String classFileVersion, String option) throws Throwable {
         System.out.println("\ninvokespecial invocation tests, option: " + option +
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(false, "-Xmx128M", option,
@@ -63,7 +63,8 @@
             System.out.println(
                 "\nAlso note that passing --dump to invokespecial.Generator will" +
                 " dump the generated classes (for debugging purposes).\n");
-            System.exit(1);
+
+            throw e;
         }
     }
 
--- old/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java	2020-04-29 12:08:25.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/InvocationTests/invokevirtualTests.java	2020-04-29 12:08:24.000000000 -0700
@@ -34,7 +34,7 @@
  *          shared/ByteArrayClassLoader.java shared/Checker.java shared/GenericClassGenerator.java
  * @compile invokevirtual/Checker.java invokevirtual/ClassGenerator.java invokevirtual/Generator.java
  *
- * @run main/othervm/timeout=1800 invokevirtualTests
+ * @run driver/timeout=1800 invokevirtualTests
  */
 
 import jdk.test.lib.process.ProcessTools;
@@ -43,7 +43,7 @@
 
 public class invokevirtualTests {
 
-    public static void runTest(String classFileVersion, String option) throws Exception {
+    public static void runTest(String classFileVersion, String option) throws Throwable {
         System.out.println("\ninvokevirtual invocation tests, option: " + option +
                            ", class file version: " + classFileVersion);
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(false, "-Xmx128M", option,
@@ -63,7 +63,8 @@
             System.out.println(
                 "\nAlso note that passing --dump to invokevirtual.Generator will" +
                 " dump the generated classes (for debugging purposes).\n");
-            System.exit(1);
+
+            throw e;
         }
     }
 
--- old/test/hotspot/jtreg/runtime/LoadClass/LoadClassNegative.java	2020-04-29 12:08:27.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/LoadClass/LoadClassNegative.java	2020-04-29 12:08:26.000000000 -0700
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @build TestForName
- * @run main LoadClassNegative
+ * @run driver LoadClassNegative
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/LoadClass/LongBCP.java	2020-04-29 12:08:29.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/LoadClass/LongBCP.java	2020-04-29 12:08:29.000000000 -0700
@@ -30,7 +30,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar
- * @run main LongBCP
+ * @run driver LongBCP
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/Metaspace/MaxMetaspaceSizeTest.java	2020-04-29 12:08:31.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/Metaspace/MaxMetaspaceSizeTest.java	2020-04-29 12:08:31.000000000 -0700
@@ -29,7 +29,7 @@
  * @requires vm.bits == 64 & vm.opt.final.UseCompressedOops == true
  * @bug 8087291
  * @library /test/lib
- * @run main/othervm MaxMetaspaceSizeTest
+ * @run driver MaxMetaspaceSizeTest
  */
 
 public class MaxMetaspaceSizeTest {
--- old/test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java	2020-04-29 12:08:34.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java	2020-04-29 12:08:33.000000000 -0700
@@ -29,6 +29,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver CheckForProperDetailStackTrace
  */
 
 import jdk.test.lib.Platform;
--- old/test/hotspot/jtreg/runtime/NMT/CommandLineDetail.java	2020-04-29 12:08:37.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/NMT/CommandLineDetail.java	2020-04-29 12:08:36.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver CommandLineDetail
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/NMT/CommandLineEmptyArgument.java	2020-04-29 12:08:41.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/NMT/CommandLineEmptyArgument.java	2020-04-29 12:08:39.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver CommandLineEmptyArgument
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/NMT/CommandLineInvalidArgument.java	2020-04-29 12:08:50.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/NMT/CommandLineInvalidArgument.java	2020-04-29 12:08:47.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver CommandLineInvalidArgument
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/NMT/CommandLineSummary.java	2020-04-29 12:09:00.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/NMT/CommandLineSummary.java	2020-04-29 12:08:57.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver CommandLineSummary
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/NMT/CommandLineTurnOffNMT.java	2020-04-29 12:09:09.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/NMT/CommandLineTurnOffNMT.java	2020-04-29 12:09:06.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver CommandLineTurnOffNMT
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java	2020-04-29 12:09:12.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java	2020-04-29 12:09:11.000000000 -0700
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main JcmdWithNMTDisabled 1
+ * @run driver JcmdWithNMTDisabled 1
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/NMT/NMTWithCDS.java	2020-04-29 12:09:15.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/NMT/NMTWithCDS.java	2020-04-29 12:09:14.000000000 -0700
@@ -29,7 +29,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main NMTWithCDS
+ * @run driver NMTWithCDS
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/NMT/PrintNMTStatistics.java	2020-04-29 12:09:19.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/NMT/PrintNMTStatistics.java	2020-04-29 12:09:18.000000000 -0700
@@ -28,6 +28,7 @@
  * @summary Verify PrintNMTStatistics on normal JVM exit for detail and summary tracking level
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @run driver PrintNMTStatistics
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java	2020-04-29 12:09:21.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java	2020-04-29 12:09:20.000000000 -0700
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver PrintNMTStatisticsWithNMTDisabled
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/PerfMemDestroy/PerfMemDestroy.java	2020-04-29 12:09:22.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/PerfMemDestroy/PerfMemDestroy.java	2020-04-29 12:09:22.000000000 -0700
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main PerfMemDestroy
+ * @run driver PerfMemDestroy
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/PrintStringTableStats/PrintStringTableStatsTest.java	2020-04-29 12:09:26.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/PrintStringTableStats/PrintStringTableStatsTest.java	2020-04-29 12:09:24.000000000 -0700
@@ -28,7 +28,7 @@
  * @test PrintStringTableStatsTest
  * @bug 8211821
  * @library /test/lib
- * @run main PrintStringTableStatsTest
+ * @run driver PrintStringTableStatsTest
  */
 
 public class PrintStringTableStatsTest {
--- old/test/hotspot/jtreg/runtime/Safepoint/TestAbortOnVMOperationTimeout.java	2020-04-29 12:09:28.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/Safepoint/TestAbortOnVMOperationTimeout.java	2020-04-29 12:09:27.000000000 -0700
@@ -31,6 +31,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver TestAbortOnVMOperationTimeout
  */
 
 public class TestAbortOnVMOperationTimeout {
--- old/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java	2020-04-29 12:09:29.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/Safepoint/TestAbortVMOnSafepointTimeout.java	2020-04-29 12:09:29.000000000 -0700
@@ -32,6 +32,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver TestAbortVMOnSafepointTimeout
  */
 
 public class TestAbortVMOnSafepointTimeout {
--- old/test/hotspot/jtreg/runtime/Thread/TooSmallStackSize.java	2020-04-29 12:09:31.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/Thread/TooSmallStackSize.java	2020-04-29 12:09:31.000000000 -0700
@@ -30,7 +30,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main TooSmallStackSize
+ * @run driver TooSmallStackSize
  */
 
 /*
--- old/test/hotspot/jtreg/runtime/Throwable/TestMaxJavaStackTraceDepth.java	2020-04-29 12:09:35.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/Throwable/TestMaxJavaStackTraceDepth.java	2020-04-29 12:09:34.000000000 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc:open
  * @modules java.base/java.lang:open
  * @library /test/lib
- * @run main TestMaxJavaStackTraceDepth runTest
+ * @run driver TestMaxJavaStackTraceDepth runTest
  */
 
 import java.lang.reflect.Field;
--- old/test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java	2020-04-29 12:09:39.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java	2020-04-29 12:09:38.000000000 -0700
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @requires os.family == "solaris" | os.family == "linux" | os.family == "mac"
- * @run main XCheckJSig
+ * @run driver XCheckJSig
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/cds/MaxMetaspaceSize.java	2020-04-29 12:09:42.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/cds/MaxMetaspaceSize.java	2020-04-29 12:09:41.000000000 -0700
@@ -29,6 +29,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @run driver MaxMetaspaceSize
  */
 
 import java.util.ArrayList;
--- old/test/hotspot/jtreg/runtime/classFileParserBug/ClassFileParserBug.java	2020-04-29 12:09:44.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/classFileParserBug/ClassFileParserBug.java	2020-04-29 12:09:44.000000000 -0700
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile LambdaMath.jcod
- * @run main ClassFileParserBug
+ * @run driver ClassFileParserBug
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java	2020-04-29 12:09:47.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java	2020-04-29 12:09:46.000000000 -0700
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile emptynumbootstrapmethods1.jcod emptynumbootstrapmethods2.jcod
- * @run main TestEmptyBootstrapMethodsAttr
+ * @run driver TestEmptyBootstrapMethodsAttr
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/condy/BadBSMUseTest.java	2020-04-29 12:09:49.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/condy/BadBSMUseTest.java	2020-04-29 12:09:48.000000000 -0700
@@ -29,7 +29,7 @@
  * @library /test/lib
  * @compile CondyUsesIndyBSM.jcod
  * @compile IndyUsesCondyBSM.jcod
- * @run main/othervm -Xverify:all BadBSMUseTest
+ * @run driver BadBSMUseTest
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/condy/CondyLDCTest.java	2020-04-29 12:09:50.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/condy/CondyLDCTest.java	2020-04-29 12:09:50.000000000 -0700
@@ -30,7 +30,7 @@
  * @compile CondyUseLDC_W.jasm
  * @compile CondyBadLDC2_W.jasm
  * @compile CondyBadLDC.jasm
- * @run main/othervm -Xverify:all CondyLDCTest
+ * @run driver CondyLDCTest
  */
 
 import jdk.test.lib.process.ProcessTools;
@@ -41,14 +41,16 @@
     public static void main(String args[]) throws Throwable {
         // 1. Test a ldc_w instruction can be used with condy's which generate
         //    loadable constants of the following types: byte, char, short, float, integer, boolean.
-        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("CondyUseLDC_W");
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xverify:all",
+                                                                  "CondyUseLDC_W");
         OutputAnalyzer oa = new OutputAnalyzer(pb.start());
         oa.shouldNotContain("VerifyError");
         oa.shouldHaveExitValue(0);
 
         // 2. Test ldc2_w of a condy which returns a dynamically generated
         //    float constant, generates a VerifyError.
-        pb = ProcessTools.createJavaProcessBuilder("CondyBadLDC2_W");
+        pb = ProcessTools.createJavaProcessBuilder("-Xverify:all",
+                                                   "CondyBadLDC2_W");
         oa = new OutputAnalyzer(pb.start());
         oa.shouldContain("java.lang.VerifyError: Illegal type at constant pool entry");
         oa.shouldContain("CondyBadLDC2_W.F()F @0: ldc2_w");
@@ -56,7 +58,8 @@
 
         // 3. Test a ldc of a condy which returns a dynamically generated
         //    double constant, generates a VerifyError.
-        pb = ProcessTools.createJavaProcessBuilder("CondyBadLDC");
+        pb = ProcessTools.createJavaProcessBuilder("-Xverify:all",
+                                                   "CondyBadLDC");
         oa = new OutputAnalyzer(pb.start());
         oa.shouldContain("java.lang.VerifyError: Illegal type at constant pool entry");
         oa.shouldContain("CondyBadLDC.D()D @0: ldc");
--- old/test/hotspot/jtreg/runtime/condy/CondyNewInvokeSpecialTest.java	2020-04-29 12:09:52.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/condy/CondyNewInvokeSpecialTest.java	2020-04-29 12:09:52.000000000 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @compile CondyNewInvokeSpecial.jasm
- * @run main/othervm -Xverify:all CondyNewInvokeSpecialTest
+ * @run driver CondyNewInvokeSpecialTest
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/condy/escapeAnalysis/TestEscapeCondy.java	2020-04-29 12:09:55.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/condy/escapeAnalysis/TestEscapeCondy.java	2020-04-29 12:09:54.000000000 -0700
@@ -31,7 +31,7 @@
  * @compile TestEscapeThroughInvokeWithCondy$A.jasm
  * @compile TestEscapeThroughInvokeWithCondy.jasm
  * @compile TestEscapeCondy.java
- * @run main/othervm TestEscapeCondy
+ * @run driver TestEscapeCondy
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/condy/staticInit/TestInitException.java	2020-04-29 12:09:57.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/condy/staticInit/TestInitException.java	2020-04-29 12:09:56.000000000 -0700
@@ -29,7 +29,7 @@
  * @library /test/lib
  * @compile Example.jasm
  * @compile StaticInit.java
- * @run main/othervm TestInitException
+ * @run driver TestInitException
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/contended/Options.java	2020-04-29 12:09:59.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/contended/Options.java	2020-04-29 12:09:59.000000000 -0700
@@ -32,7 +32,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main Options
+ * @run driver Options
  */
 public class Options {
 
--- old/test/hotspot/jtreg/runtime/duplAttributes/DuplAttributesTest.java	2020-04-29 12:10:02.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/duplAttributes/DuplAttributesTest.java	2020-04-29 12:10:01.000000000 -0700
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @compile DuplAttributes.jcod
- * @run main DuplAttributesTest
+ * @run driver DuplAttributesTest
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/getSysPackage/GetPackageXbootclasspath.java	2020-04-29 12:10:04.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/getSysPackage/GetPackageXbootclasspath.java	2020-04-29 12:10:03.000000000 -0700
@@ -26,7 +26,7 @@
  * @bug 8187436
  * @summary Test that getPackage() works with a class loaded via -Xbootclasspath/a.
  * @library /test/lib
- * @run main/othervm GetPackageXbootclasspath
+ * @run driver GetPackageXbootclasspath
  */
 
 // This is a regression test for a bug with the exploded build but should pass
--- old/test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java	2020-04-29 12:10:06.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java	2020-04-29 12:10:05.000000000 -0700
@@ -27,7 +27,7 @@
  * @modules java.base/jdk.internal.loader
  *          java.logging
  * @library /test/lib
- * @run main/othervm GetSysPkgTest
+ * @run driver GetSysPkgTest
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/logging/ModulesTest.java	2020-04-29 12:10:08.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/logging/ModulesTest.java	2020-04-29 12:10:08.000000000 -0700
@@ -27,7 +27,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main ModulesTest
+ * @run driver ModulesTest
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- old/test/hotspot/jtreg/runtime/memory/ReadFromNoaccessArea.java	2020-04-29 12:10:12.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/memory/ReadFromNoaccessArea.java	2020-04-29 12:10:11.000000000 -0700
@@ -30,7 +30,7 @@
  *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main ReadFromNoaccessArea
+ * @run driver ReadFromNoaccessArea
  */
 
 import jdk.test.lib.Platform;
--- old/test/hotspot/jtreg/runtime/memory/ReserveMemory.java	2020-04-29 12:10:15.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/memory/ReserveMemory.java	2020-04-29 12:10:14.000000000 -0700
@@ -33,7 +33,7 @@
  *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main ReserveMemory
+ * @run driver ReserveMemory
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/modules/ClassLoaderNoUnnamedModuleTest.java	2020-04-29 12:10:17.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/ClassLoaderNoUnnamedModuleTest.java	2020-04-29 12:10:16.000000000 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @compile ClassLoaderNoUnnamedModule.java
- * @run main/othervm ClassLoaderNoUnnamedModuleTest
+ * @run driver ClassLoaderNoUnnamedModuleTest
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/modules/IgnoreModulePropertiesTest.java	2020-04-29 12:10:19.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/IgnoreModulePropertiesTest.java	2020-04-29 12:10:18.000000000 -0700
@@ -27,6 +27,7 @@
  * @summary Test that the VM ignores explicitly specified module internal properties.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @run driver IgnoreModulePropertiesTest
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- old/test/hotspot/jtreg/runtime/modules/ModuleOptionsTest.java	2020-04-29 12:10:24.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/ModuleOptionsTest.java	2020-04-29 12:10:23.000000000 -0700
@@ -28,6 +28,7 @@
  *          options but accumulates --add-module values.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @run driver ModuleOptionsTest
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- old/test/hotspot/jtreg/runtime/modules/ModuleOptionsWarn.java	2020-04-29 12:10:26.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/ModuleOptionsWarn.java	2020-04-29 12:10:26.000000000 -0700
@@ -27,6 +27,7 @@
  * @summary Test warnings for ignored properties.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @run driver ModuleOptionsWarn
  */
 
 import java.util.Map;
--- old/test/hotspot/jtreg/runtime/modules/ModuleStress/ExportModuleStressTest.java	2020-04-29 12:10:29.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/ModuleStress/ExportModuleStressTest.java	2020-04-29 12:10:28.000000000 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @compile ../CompilerUtils.java
- * @run main/othervm ExportModuleStressTest
+ * @run driver ExportModuleStressTest
  */
 
 import java.nio.file.Path;
--- old/test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleStress.java	2020-04-29 12:10:34.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleStress.java	2020-04-29 12:10:33.000000000 -0700
@@ -31,7 +31,7 @@
  * @compile ModuleSameCLMain.java
  * @compile ModuleNonBuiltinCLMain.java
  * @compile CustomSystemClassLoader.java
- * @run main/othervm ModuleStress
+ * @run driver ModuleStress
  */
 
 import jdk.test.lib.process.ProcessTools;
--- old/test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleStressGC.java	2020-04-29 12:10:38.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/ModuleStress/ModuleStressGC.java	2020-04-29 12:10:37.000000000 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @compile ../CompilerUtils.java
- * @run main/othervm ModuleStressGC
+ * @run driver ModuleStressGC
  */
 
 import java.nio.file.Path;
--- old/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModule2Dirs.java	2020-04-29 12:10:43.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModule2Dirs.java	2020-04-29 12:10:42.000000000 -0700
@@ -27,7 +27,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @compile PatchModule2DirsMain.java
- * @run main PatchModule2Dirs
+ * @run driver PatchModule2Dirs
  */
 
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
--- old/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleCDS.java	2020-04-29 12:10:46.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleCDS.java	2020-04-29 12:10:46.000000000 -0700
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  *          jdk.jartool/sun.tools.jar
  * @build PatchModuleMain
- * @run main PatchModuleCDS
+ * @run driver PatchModuleCDS
  */
 
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
--- old/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleDupJavaBase.java	2020-04-29 12:10:48.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleDupJavaBase.java	2020-04-29 12:10:48.000000000 -0700
@@ -26,6 +26,7 @@
  * @summary VM exit initialization results if java.base is specificed more than once to --patch-module.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @run driver PatchModuleDupJavaBase
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- old/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleDupModule.java	2020-04-29 12:10:51.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleDupModule.java	2020-04-29 12:10:50.000000000 -0700
@@ -26,6 +26,7 @@
  * @summary Module system initialization exception results if a module is specificed twice to --patch-module.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @run driver PatchModuleDupModule
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- old/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleJavaBase.java	2020-04-29 12:10:53.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleJavaBase.java	2020-04-29 12:10:53.000000000 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @compile PatchModuleMain.java
- * @run main PatchModuleJavaBase
+ * @run driver PatchModuleJavaBase
  */
 
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
--- old/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTest.java	2020-04-29 12:10:56.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTest.java	2020-04-29 12:10:55.000000000 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @compile PatchModuleMain.java
- * @run main PatchModuleTest
+ * @run driver PatchModuleTest
  */
 
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
--- old/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTestJar.java	2020-04-29 12:10:58.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTestJar.java	2020-04-29 12:10:57.000000000 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  *          jdk.jartool/sun.tools.jar
  * @compile PatchModuleMain.java
- * @run main PatchModuleTestJar
+ * @run driver PatchModuleTestJar
  */
 
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
--- old/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTestJarDir.java	2020-04-29 12:11:01.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTestJarDir.java	2020-04-29 12:11:00.000000000 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  *          jdk.jartool/sun.tools.jar
  * @compile PatchModule2DirsMain.java
- * @run main PatchModuleTestJarDir
+ * @run driver PatchModuleTestJarDir
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTraceCL.java	2020-04-29 12:11:03.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/PatchModule/PatchModuleTraceCL.java	2020-04-29 12:11:03.000000000 -0700
@@ -29,7 +29,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @compile PatchModuleMain.java
- * @run main PatchModuleTraceCL
+ * @run driver PatchModuleTraceCL
  */
 
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
--- old/test/hotspot/jtreg/runtime/modules/Visibility/PatchModuleVisibility.java	2020-04-29 12:11:05.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/Visibility/PatchModuleVisibility.java	2020-04-29 12:11:05.000000000 -0700
@@ -29,7 +29,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main/othervm PatchModuleVisibility
+ * @run driver PatchModuleVisibility
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/modules/Visibility/XbootcpNoVisibility.java	2020-04-29 12:11:08.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/Visibility/XbootcpNoVisibility.java	2020-04-29 12:11:07.000000000 -0700
@@ -28,7 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main/othervm XbootcpNoVisibility
+ * @run driver XbootcpNoVisibility
  */
 
 import jdk.test.lib.compiler.InMemoryJavaCompiler;
--- old/test/hotspot/jtreg/runtime/modules/Visibility/XbootcpVisibility.java	2020-04-29 12:11:10.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/modules/Visibility/XbootcpVisibility.java	2020-04-29 12:11:09.000000000 -0700
@@ -29,7 +29,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
- * @run main/othervm XbootcpVisibility
+ * @run driver XbootcpVisibility
  */
 
 import java.io.File;
--- old/test/hotspot/jtreg/runtime/records/ignoreRecordAttribute.java	2020-04-29 12:11:12.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/records/ignoreRecordAttribute.java	2020-04-29 12:11:11.000000000 -0700
@@ -22,12 +22,12 @@
  */
 
 /*
-* @test
-* @summary test logging of reasons for ignoring Record attribute
-* @library /test/lib
-* @compile superNotJLRecord.jcod recordIgnoredVersion.jcod
-* @run main/othervm --enable-preview ignoreRecordAttribute
-*/
+ * @test
+ * @summary test logging of reasons for ignoring Record attribute
+ * @library /test/lib
+ * @compile superNotJLRecord.jcod recordIgnoredVersion.jcod
+ * @run driver ignoreRecordAttribute
+ */
 
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
--- old/test/hotspot/jtreg/runtime/stringtable/StringTableVerifyTest.java	2020-04-29 12:11:15.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/stringtable/StringTableVerifyTest.java	2020-04-29 12:11:14.000000000 -0700
@@ -27,7 +27,7 @@
  * @summary VerifyStringTableAtExit should not crash
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- * @run main StringTableVerifyTest
+ * @run driver StringTableVerifyTest
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
--- old/test/hotspot/jtreg/runtime/verifier/TraceClassRes.java	2020-04-29 12:11:17.000000000 -0700
+++ new/test/hotspot/jtreg/runtime/verifier/TraceClassRes.java	2020-04-29 12:11:16.000000000 -0700
@@ -27,6 +27,7 @@
  * @summary split verifier needs to add class resolution tracing
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
+ * @run driver TraceClassRes
  */
 
 import jdk.test.lib.process.ProcessTools;