--- a/test/jdk/TEST.groups	Tue Apr 17 19:25:50 2018 +0100
+++ b/test/jdk/TEST.groups	Tue Apr 17 16:18:22 2018 -0400
@@ -37,19 +37,30 @@
     tools/pack200
 
 tier2 = \
+    :tier2_part1 \
+    :tier2_part2 \
+    :tier2_part3
+
+# com/sun/crypto/provider/Cipher is in tier1 because of JDK-8132855
+tier2_part1 = \
+    :jdk_security \
+    -com/sun/crypto/provider/Cipher
+
+# sun/nio/cs/ISO8859x.java and java/nio/Buffer are in tier1 because of JDK-8132854
+tier2_part2 = \
+    :core_tools \
+    -tools/pack200 \
     :jdk_io \
     :jdk_nio \
+    -java/nio/Buffer \
     -sun/nio/cs/ISO8859x.java \
-    -java/nio/Buffer \
-    :jdk_net \
-    :jdk_time \
-    :jdk_security \
-    -com/sun/crypto/provider/Cipher \
+    :jdk_other \
     :jdk_text \
-    :core_tools \
-    -tools/pack200 \
-    :jdk_other
+    :jdk_time
 
+tier2_part3 = \
+    :jdk_net
+   
 tier3 = \
     :jdk_rmi \
     :jdk_beans \