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