--- old/test/hotspot/jtreg/TEST.groups	2018-03-07 20:57:36.000000000 -0800
+++ new/test/hotspot/jtreg/TEST.groups	2018-03-07 20:57:36.000000000 -0800
@@ -31,6 +31,10 @@
 hotspot_compiler = \
   compiler
 
+hotspot_compiler_xcomp = \
+  :hotspot_compiler \
+  -:compiler_aot
+
 hotspot_gc = \
   gc
 
@@ -64,7 +68,7 @@
   :tier1_compiler_3
 
 tier1_compiler_1 = \
-  compiler/aot/ \
+  :compiler_aot \
   compiler/arraycopy/ \
   compiler/c1/ \
   compiler/c2/ \
@@ -123,7 +127,10 @@
   :hotspot_compiler \
   -:tier1_compiler_1 \
   -:tier1_compiler_2 \
-  -:tier1_compiler_3 \
+  -:tier1_compiler_3
+
+compiler_aot = \
+  compiler/aot
 
 ctw_1 = \
   applications/ctw/modules/ \