--- 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;
         }
     }