--- old/test/hotspot/jtreg/TEST.groups	2018-06-12 16:09:27.605104992 -0700
+++ new/test/hotspot/jtreg/TEST.groups	2018-06-12 16:09:27.232105998 -0700
@@ -209,6 +209,7 @@
  -runtime/ConstantPool/IntfMethod.java \
  -runtime/ErrorHandling/CreateCoredumpOnCrash.java \
  -runtime/ErrorHandling/ErrorHandler.java \
+ -runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java \
  -runtime/ErrorHandling/TimeoutInErrorHandlingTest.java \
  -runtime/logging/MonitorMismatchTest.java \
  -runtime/memory/ReserveMemory.java \
@@ -271,6 +272,8 @@
   serviceability/logging \
   serviceability/sa \
   -serviceability/sa/ClhsdbScanOops.java \
+  -serviceability/sa/TestJmapCore.java \
+  -serviceability/sa/TestJmapCoreMetaspace.java \
   -serviceability/sa/TestHeapDumpForLargeArray.java
 
 tier1 = \
@@ -2263,17 +2266,6 @@
 vmTestbase_vm_mlvm = \
   vmTestbase/vm/mlvm
 
-# Heap dump tests
-vmTestbase_vm_heapdump = \
-  vmTestbase/heapdump
-
-vmTestbase_vm_heapdump_quick = \
-  vmTestbase/heapdump/OnOOMToFile/TestDescription.java \
-  vmTestbase/heapdump/OnOOMToFileMetaspace/TestDescription.java \
-  vmTestbase/heapdump/OnOOMToPath/TestDescription.java \
-  vmTestbase/heapdump/JMapHeapCore/TestDescription.java \
-  vmTestbase/heapdump/JMapMetaspace/TestDescription.java
-
 # Tests for attach-on-demand implementation
 vmTestbase_nsk_aod = \
   vmTestbase/nsk/aod