--- a/test/hotspot/jtreg/TEST.groups	Thu Mar 22 10:45:20 2018 -0700
+++ b/test/hotspot/jtreg/TEST.groups	Thu Mar 22 16:39:02 2018 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,10 @@
 hotspot_compiler = \
   compiler
 
+hotspot_compiler_xcomp = \
+  :hotspot_compiler \
+  -:tier1_compiler_not_xcomp
+
 hotspot_gc = \
   gc
 
@@ -61,10 +65,14 @@
 tier1_compiler = \
   :tier1_compiler_1 \
   :tier1_compiler_2 \
-  :tier1_compiler_3
+  :tier1_compiler_3 \
+  :tier1_compiler_not_xcomp
+
+hotspot_not_fast_compiler = \
+  :hotspot_compiler \
+  -:tier1_compiler
 
 tier1_compiler_1 = \
-  compiler/aot/ \
   compiler/arraycopy/ \
   compiler/c1/ \
   compiler/c2/ \
@@ -120,11 +128,8 @@
   -compiler/loopopts/Test7052494.java \
   -compiler/runtime/Test6826736.java
 
-hotspot_not_fast_compiler = \
-  :hotspot_compiler \
-  -:tier1_compiler_1 \
-  -:tier1_compiler_2 \
-  -:tier1_compiler_3 \
+tier1_compiler_not_xcomp = \
+  compiler/aot
 
 ctw_1 = \
   applications/ctw/modules/ \
@@ -140,6 +145,10 @@
   :tier1_gc_gcold \
   :tier1_gc_gcbasher 
 
+hotspot_not_fast_gc = \
+  :hotspot_gc \
+  -:tier1_gc
+
 tier1_gc_1 = \
   gc/g1/
 
@@ -154,9 +163,9 @@
   -gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
 
 tier1_gc_gcold = \
-  gc/stress/gcold/TestGCOldWithG1.java
-  gc/stress/gcold/TestGCOldWithCMS.java
-  gc/stress/gcold/TestGCOldWithSerial.java
+  gc/stress/gcold/TestGCOldWithG1.java \
+  gc/stress/gcold/TestGCOldWithCMS.java \
+  gc/stress/gcold/TestGCOldWithSerial.java \
   gc/stress/gcold/TestGCOldWithParallel.java
 
 tier1_gc_gcbasher = \
@@ -271,3 +280,13 @@
   runtime/ErrorHandling \
   runtime/logging
 
+hotspot_nmt = \
+  runtime/NMT
+
+hotspot_rest_runtime = \
+  :hotspot_runtime \
+  -:tier1_runtime \
+  -:tier1_runtime_appcds_exclude \
+  -:hotspot_nmt \
+  -:hotspot_tier2_runtime_platform_agnostic
+

--- a/test/hotspot/jtreg/compiler/c2/Test6603011.java	Thu Mar 22 10:45:20 2018 -0700
+++ b/test/hotspot/jtreg/compiler/c2/Test6603011.java	Thu Mar 22 16:39:02 2018 -0700
@@ -28,7 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  *
- * @run main/othervm -Xcomp -Xbatch -XX:-Inline compiler.c2.Test6603011
+ * @run main/othervm/timeout=480 -Xcomp -Xbatch -XX:-Inline compiler.c2.Test6603011
  */
 
 //

--- a/test/hotspot/jtreg/compiler/compilercontrol/mixed/RandomCommandsTest.java	Thu Mar 22 10:45:20 2018 -0700
+++ b/test/hotspot/jtreg/compiler/compilercontrol/mixed/RandomCommandsTest.java	Thu Mar 22 16:39:02 2018 -0700
@@ -31,7 +31,7 @@
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver/timeout=600 compiler.compilercontrol.mixed.RandomCommandsTest
+ * @run driver/timeout=1200 compiler.compilercontrol.mixed.RandomCommandsTest
  */
 
 package compiler.compilercontrol.mixed;

--- a/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java	Thu Mar 22 10:45:20 2018 -0700
+++ b/test/hotspot/jtreg/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java	Thu Mar 22 16:39:02 2018 -0700
@@ -30,7 +30,7 @@
  *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run driver TestMinAndInitialSurvivorRatioFlags
+ * @run driver/timeout=240 TestMinAndInitialSurvivorRatioFlags
  */
 
 import java.lang.management.MemoryUsage;

--- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java	Thu Mar 22 10:45:20 2018 -0700
+++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java	Thu Mar 22 16:39:02 2018 -0700
@@ -29,7 +29,7 @@
  *          java.management
  *          jdk.attach/sun.tools.attach
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run main/othervm/timeout=900 TestOptionsWithRanges
+ * @run main/othervm/timeout=1800 TestOptionsWithRanges
  */
 
 import java.util.ArrayList;

--- a/test/hotspot/jtreg/runtime/NMT/MallocStressTest.java	Thu Mar 22 10:45:20 2018 -0700
+++ b/test/hotspot/jtreg/runtime/NMT/MallocStressTest.java	Thu Mar 22 16:39:02 2018 -0700
@@ -30,7 +30,7 @@
  *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocStressTest
+ * @run main/othervm/timeout=1200 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocStressTest
  */
 
 import java.util.concurrent.atomic.AtomicInteger;