--- a/test/hotspot/jtreg/TEST.groups	Mon Oct 14 20:58:08 2019 +0200
+++ b/test/hotspot/jtreg/TEST.groups	Mon Oct 14 12:22:09 2019 -0700
@@ -384,26 +384,26 @@
 
 hotspot_tier2_runtime = \
   runtime/ \
-  serviceability/ \
  -runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java \
  -runtime/CompressedOops/UseCompressedOops.java \
  -runtime/InvocationTests \
  -runtime/Thread/TestThreadDumpMonitorContention.java \
  -:tier1_runtime \
- -:tier1_serviceability \
  -:hotspot_tier2_runtime_platform_agnostic \
  -runtime/signal \
  -runtime/NMT/MallocStressTest.java
 
+hotspot_tier2_serviceability = \
+  serviceability/ \
+ -:tier1_serviceability
+
 hotspot_tier2_runtime_platform_agnostic = \
   runtime/SelectionResolution \
  -:tier1_runtime
 
 hotspot_tier3_runtime = \
   runtime/ \
-  serviceability/ \
  -:tier1_runtime \
- -:tier1_serviceability \
  -:hotspot_tier2_runtime_platform_agnostic \
  -:hotspot_tier2_runtime