--- a/test/hotspot/jtreg/TEST.groups	Wed Apr 25 12:21:29 2018 -0400
+++ b/test/hotspot/jtreg/TEST.groups	Fri Apr 27 08:28:06 2018 -0700
@@ -35,6 +35,10 @@
   :hotspot_compiler \
   -:tier1_compiler_not_xcomp
 
+hotspot_compiler_all_gcs = \
+  :hotspot_compiler \
+  -:tier1_compiler_not_cms
+
 hotspot_gc = \
   gc
 
@@ -135,6 +139,10 @@
 tier1_compiler_not_xcomp = \
   compiler/aot
 
+tier1_compiler_not_cms = \
+  compiler/aot \
+  compiler/jvmci
+
 ctw_1 = \
   applications/ctw/modules/ \
   -:ctw_2 \