--- old/test/hotspot/jtreg/runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java	2018-05-24 16:04:44.510407534 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java	2018-05-24 16:04:44.175408456 -0700
@@ -23,10 +23,9 @@
 
 /*
  * @test TestHeapDumpOnOutOfMemoryError
- * @summary Test verifies that -XX:HeapDumpOnOutOfMemoryError dump heap when OutOfMemory is thrown
- * @modules java.base/jdk.internal.misc
+ * @summary Test verifies that -XX:HeapDumpOnOutOfMemoryError dump heap when OutOfMemory is thrown in heap
  * @library /test/lib
- * @run driver/timeout=240 TestHeapDumpOnOutOfMemoryError
+ * @run driver TestHeapDumpOnOutOfMemoryError run heap
  */
 
 import jdk.test.lib.Asserts;
@@ -61,9 +60,7 @@
                 return;
             }
         }
-        test(HEAP_OOME);
-        test(METASPACE_OOME);
-        testHeapDumpPath();
+        test(args[1]);
     }
 
     static void test(String type) throws Exception {
@@ -83,31 +80,4 @@
         System.out.println("PASSED");
     }
 
-    static void testHeapDumpPath() throws Exception {
-        String heapdumpPath = "dumps";
-        File dumpDirectory = new File(heapdumpPath);
-        dumpDirectory.mkdir();
-        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+HeapDumpOnOutOfMemoryError",
-                "-XX:HeapDumpPath=" + heapdumpPath, "-Xmx256m", "-XX:MaxMetaspaceSize=64m",
-                TestHeapDumpOnOutOfMemoryError.class.getName(), HEAP_OOME);
-
-        OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        output.stdoutShouldNotBeEmpty();
-        output.shouldContain("Dumping heap");
-
-        Asserts.assertFalse(dumpDirectory.listFiles().length == 0,
-                "There is no dump files found in " + dumpDirectory );
-
-        Asserts.assertTrue(dumpDirectory.listFiles().length == 1,
-                "There are unexpected files in " + dumpDirectory
-                        + ": " + String.join(",", dumpDirectory.list()) +".");
-
-        File dump = dumpDirectory.listFiles()[0];
-        Asserts.assertTrue(dump.exists() && dump.isFile(),
-                "Could not find dump file " + dump.getAbsolutePath());
-
-        HprofParser.parse(dump);
-        System.out.println("PASSED");
-    }
-
 }