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