--- a/hotspot/test/TEST.groups	Mon Feb 27 12:57:16 2017 +0100
+++ b/hotspot/test/TEST.groups	Tue Mar 07 11:35:45 2017 -0500
@@ -46,7 +46,7 @@
 hotspot_native_sanity = \
   native_sanity
 
-hotspot_fast_compiler_1 = \
+hotspot_tier1_compiler_1 = \
   compiler/aot/ \
   compiler/arraycopy/ \
   compiler/c1/ \
@@ -62,7 +62,7 @@
   -compiler/c2/Test6603011.java \
   -compiler/c2/Test6912517.java \
 
-hotspot_fast_compiler_2 = \
+hotspot_tier1_compiler_2 = \
   compiler/classUnloading/ \
   compiler/codecache/ \
   compiler/codegen/ \
@@ -81,7 +81,7 @@
   -compiler/codecache/stress \
   -compiler/gcbarriers/PreserveFPRegistersTest.java
 
-hotspot_fast_compiler_3 = \
+hotspot_tier1_compiler_3 = \
   compiler/intrinsics/ \
   compiler/jsr292/ \
   compiler/loopopts/ \
@@ -102,20 +102,20 @@
   -compiler/loopopts/Test7052494.java \
   -compiler/runtime/Test6826736.java
 
-hotspot_fast_compiler_closed = \
+hotspot_tier1_compiler_closed = \
   sanity/ExecuteInternalVMTests.java
 
 hotspot_not_fast_compiler = \
   :hotspot_compiler \
-  -:hotspot_fast_compiler_1 \
-  -:hotspot_fast_compiler_2 \
-  -:hotspot_fast_compiler_3 \
-  -:hotspot_fast_compiler_closed
+  -:hotspot_tier1_compiler_1 \
+  -:hotspot_tier1_compiler_2 \
+  -:hotspot_tier1_compiler_3 \
+  -:hotspot_tier1_compiler_closed
 
-hotspot_fast_gc_1 = \
+hotspot_tier1_gc_1 = \
   gc/g1/
 
-hotspot_fast_gc_2 = \
+hotspot_tier1_gc_2 = \
   sanity/ExecuteInternalVMTests.java \
   gc/ \
   -gc/g1/ \
@@ -125,19 +125,19 @@
   -gc/cms/TestMBeanCMS.java \
   -gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
 
-hotspot_fast_gc_closed = \
+hotspot_tier1_gc_closed = \
   sanity/ExecuteInternalVMTests.java
 
-hotspot_fast_gc_gcold = \
+hotspot_tier1_gc_gcold = \
   gc/stress/TestGCOld.java
 
-hotspot_fast_gc_gcbasher = \
+hotspot_tier1_gc_gcbasher = \
   gc/stress/gcbasher/TestGCBasherWithG1.java \
   gc/stress/gcbasher/TestGCBasherWithCMS.java \
   gc/stress/gcbasher/TestGCBasherWithSerial.java \
   gc/stress/gcbasher/TestGCBasherWithParallel.java
 
-hotspot_fast_runtime = \
+hotspot_tier1_runtime = \
   runtime/ \
  -runtime/6626217/Test6626217.sh \
  -runtime/7100935 \
@@ -187,42 +187,42 @@
   runtime/CompressedOops/
 
 
-hotspot_fast_serviceability = \
+hotspot_tier1_serviceability = \
   serviceability/dcmd/compiler \
   serviceability/logging
 
-hotspot_jprt = \
-  :hotspot_fast_compiler_1 \
-  :hotspot_fast_compiler_2 \
-  :hotspot_fast_compiler_3 \
-  :hotspot_fast_compiler_closed \
-  :hotspot_fast_gc_1 \
-  :hotspot_fast_gc_2 \
-  :hotspot_fast_gc_closed \
-  :hotspot_fast_gc_gcold \
-  :hotspot_fast_runtime \
-  :hotspot_fast_serviceability
+hotspot_tier1 = \
+  :hotspot_tier1_compiler_1 \
+  :hotspot_tier1_compiler_2 \
+  :hotspot_tier1_compiler_3 \
+  :hotspot_tier1_compiler_closed \
+  :hotspot_tier1_gc_1 \
+  :hotspot_tier1_gc_2 \
+  :hotspot_tier1_gc_closed \
+  :hotspot_tier1_gc_gcold \
+  :hotspot_tier1_runtime \
+  :hotspot_tier1_serviceability
 
-hotspot_runtime_tier2 = \
+hotspot_tier2_runtime = \
   runtime/ \
   serviceability/ \
  -runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java \
  -runtime/Thread/TestThreadDumpMonitorContention.java \
- -:hotspot_fast_runtime \
- -:hotspot_fast_serviceability \
- -:hotspot_runtime_tier2_platform_agnostic
+ -:hotspot_tier1_runtime \
+ -:hotspot_tier1_serviceability \
+ -:hotspot_tier2_runtime_platform_agnostic
 
-hotspot_runtime_tier2_platform_agnostic = \
+hotspot_tier2_runtime_platform_agnostic = \
   runtime/SelectionResolution \
- -:hotspot_fast_runtime
+ -:hotspot_tier1_runtime
 
-hotspot_runtime_tier3 = \
+hotspot_tier3_runtime = \
   runtime/ \
   serviceability/ \
- -:hotspot_fast_runtime \
- -:hotspot_fast_serviceability \
- -:hotspot_runtime_tier2_platform_agnostic \
- -:hotspot_runtime_tier2
+ -:hotspot_tier1_runtime \
+ -:hotspot_tier1_serviceability \
+ -:hotspot_tier2_runtime_platform_agnostic \
+ -:hotspot_tier2_runtime
 
 hotspot_runtime_minimalvm = \
   runtime/MinimalVM \