diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index c52cc84f177..3e2deb640c4 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -171,6 +171,8 @@ tier1_compiler_1 = \
   -compiler/c2/Test6912517.java
 
 tier1_compiler_2 = \
+  compiler/ccp/ \
+  compiler/ciTypeFlow/ \
   compiler/classUnloading/ \
   compiler/codecache/ \
   compiler/codegen/ \
@@ -181,11 +183,11 @@ tier1_compiler_2 = \
   compiler/exceptions/ \
   compiler/floatingpoint/ \
   compiler/gcbarriers/ \
+  compiler/igvn/ \
   compiler/inlining/ \
   compiler/integerArithmetic/ \
   compiler/interpreter/ \
   compiler/jvmci/ \
-  compiler/igvn/ \
   -compiler/classUnloading/methodUnloading/TestOverloadCompileQueues.java \
   -compiler/codecache/stress \
   -compiler/codegen/aes \
@@ -199,9 +201,12 @@ tier1_compiler_3 = \
   compiler/macronodes/ \
   compiler/memoryinitialization/ \
   compiler/osr/ \
+  compiler/predicates/ \
   compiler/profiling \
   compiler/regalloc/ \
   compiler/runtime/ \
+  compiler/sharedstubs/ \
+  compiler/splitif/ \
   compiler/startup/ \
   compiler/types/ \
   compiler/uncommontrap/ \
diff --git a/test/hotspot/jtreg/compiler/ccp/TestAndConZeroCCP.java b/test/hotspot/jtreg/compiler/ccp/TestAndConZeroCCP.java
index 4304db5489c..628cbae8d86 100644
--- a/test/hotspot/jtreg/compiler/ccp/TestAndConZeroCCP.java
+++ b/test/hotspot/jtreg/compiler/ccp/TestAndConZeroCCP.java
@@ -26,7 +26,7 @@
  * @bug 8350563
  * @summary Test that And nodes are monotonic and added to the CCP worklist if they have a constant as input.
  * @run main/othervm -Xbatch -XX:-TieredCompilation compiler.ccp.TestAndConZeroCCP
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:RepeatCompilation=300 -XX:+StressIGVN -XX:+StressCCP -Xcomp
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:RepeatCompilation=100 -XX:+StressIGVN -XX:+StressCCP -Xcomp
  *                   -XX:CompileOnly=java.lang.Integer::parseInt compiler.ccp.TestAndConZeroCCP compileonly
  * @run main compiler.ccp.TestAndConZeroCCP
  */
@@ -42,7 +42,7 @@ public class TestAndConZeroCCP {
             return;
         }
 
-        for (int i = 0; i < 10000; ++i) {
+        for (int i = 0; i < 100; ++i) {
             run();
         }
     }