--- a/test/hotspot/jtreg/TEST.groups	Tue May 15 14:35:51 2018 +0200
+++ b/test/hotspot/jtreg/TEST.groups	Tue May 15 11:28:29 2018 -0700
@@ -1150,3 +1150,14 @@
   vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java \
   vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java
 
+# 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
+