--- a/test/hotspot/jtreg/TEST.groups	Thu May 17 12:59:53 2018 -0700
+++ b/test/hotspot/jtreg/TEST.groups	Thu May 17 14:52:47 2018 -0700
@@ -1157,6 +1157,100 @@
   vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues002/getArgumentValues002.java \
   vmTestbase/nsk/jdi/StackFrame/getArgumentValues/getArgumentValues003/getArgumentValues003.java
 
+vmTestbase_vm_g1classunloading = \
+  vmTestbase/gc/g1/unloading/tests
+
+# Garbage collector tests
+vmTestbase_vm_gc = \
+  :vmTestbase_vm_gc_concurrent \
+  :vmTestbase_vm_gc_container \
+  :vmTestbase_vm_gc_compact \
+  :vmTestbase_vm_gc_juggle \
+  :vmTestbase_vm_gc_locker \
+  :vmTestbase_vm_gc_misc \
+  :vmTestbase_vm_gc_ref
+
+# vmTestbase_vm_gc w/ 'quick' k/w
+vmTestbase_vm_gc_quick = \
+  vmTestbase/vm/gc/compact/Compact_Arrays \
+  vmTestbase/vm/gc/compact/Compact_Strings_TwoFields \
+  vmTestbase/vm/gc/compact/Compact_InternedStrings_Strings \
+  vmTestbase/vm/gc/compact/Humongous_Arrays5M \
+  vmTestbase/vm/gc/compact/Humongous_NonbranchyTree \
+  vmTestbase/vm/gc/containers/LinkedBlockingDeque_Arrays/TestDescription.java \
+  vmTestbase/vm/gc/containers/LinkedHashMap_Arrays/TestDescription.java \
+  vmTestbase/vm/gc/containers/Combination05/TestDescription.java \
+  vmTestbase/gc/ArrayJuggle/Juggle01 \
+  vmTestbase/gc/ArrayJuggle/Juggle14 \
+  vmTestbase/gc/ArrayJuggle/Juggle22 \
+  vmTestbase/gc/ArrayJuggle/Juggle29 \
+  vmTestbase/gc/ArrayJuggle/Juggle34 \
+  vmTestbase/gc/gctests/LargeObjects/large001/large001.java \
+  vmTestbase/gc/gctests/LoadUnloadGC2/LoadUnloadGC2.java \
+  vmTestbase/gc/gctests/StringGC/StringGC.java \
+  vmTestbase/gc/gctests/StringInternGC/StringInternGC.java \
+  vmTestbase/gc/gctests/ReferencesGC/ReferencesGC.java \
+  vmTestbase/vm/gc/kind/parOld/TestDescription.java \
+  vmTestbase/gc/lock/jni/jnilock001/TestDescription.java \
+  vmTestbase/gc/lock/jniref/jnireflock04/TestDescription.java \
+  vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock02/TestDescription.java \
+  vmTestbase/gc/lock/malloc/malloclock03/TestDescription.java
+
+# In a loop: fill out the heap until OOME and then partly clear it. Variate object type and size
+vmTestbase_vm_gc_compact = \
+  vmTestbase/vm/gc/compact
+
+# GC and mutlithreads
+vmTestbase_vm_gc_concurrent = \
+  vmTestbase/vm/gc/concurrent
+
+# Various data structures
+vmTestbase_vm_gc_container = \
+  vmTestbase/vm/gc/containers \
+  vmTestbase/gc/vector
+
+# Playing with object arrays and various strategies of garbage producing
+vmTestbase_vm_gc_juggle = \
+  vmTestbase/gc/ArrayJuggle/ \
+  vmTestbase/gc/memory/Array/ArrayJuggle
+
+# GC Locker
+vmTestbase_vm_gc_locker = \
+  vmTestbase/gc/lock \
+  vmTestbase/gc/gctests/mallocWithGC1/mallocWithGC1.java \
+  vmTestbase/gc/gctests/mallocWithGC2/mallocWithGC2.java \
+  vmTestbase/gc/gctests/mallocWithGC3/mallocWithGC3.java \
+  vmTestbase/gc/gctests/nativeGC01/nativeGC01.java \
+  vmTestbase/gc/gctests/nativeGC02/nativeGC02.java \
+  vmTestbase/gc/gctests/nativeGC03/nativeGC03.java \
+  vmTestbase/gc/gctests/nativeGC05/nativeGC05.java
+
+# GC and references
+vmTestbase_vm_gc_ref = \
+  vmTestbase/gc/gctests/SoftReference \
+  vmTestbase/gc/gctests/WeakReference \
+  vmTestbase/gc/gctests/WeakReferenceGC \
+  vmTestbase/gc/gctests/PhantomReference \
+  vmTestbase/gc/gctests/ReferencesGC
+
+# miscellaneous gc tests
+vmTestbase_vm_gc_misc = \
+  vmTestbase/gc \
+  vmTestbase/vm/gc \
+  -:vmTestbase_vm_g1classunloading \
+  -:vmTestbase_vm_gc_compact \
+  -:vmTestbase_vm_gc_concurrent \
+  -:vmTestbase_vm_gc_container \
+  -:vmTestbase_vm_gc_juggle \
+  -:vmTestbase_vm_gc_locker \
+  -:vmTestbase_vm_gc_ref
+
+vmTestbase_largepages = \
+  vmTestbase/gc/gctests/LoadUnloadGC \
+  vmTestbase/gc/gctests/LoadUnloadGC2 \
+  vmTestbase/gc/memory/LargePagesTest \
+  vmTestbase/gc/memory/Nio
+
 # JSR292 tests (invokedynamic AKA Multi-Language VM AKA Da Vinci Machine)
 vmTestbase_vm_mlvm = \
   vmTestbase/vm/mlvm