diff --git a/jdk/test/TEST.groups b/jdk/test/TEST.groups
index 9733e17ccfa..1c50d8111a8 100644
--- a/jdk/test/TEST.groups
+++ b/jdk/test/TEST.groups
@@ -29,7 +29,8 @@ jdk_tier1 = \
     :jdk_lang \
     :jdk_util \
     :jdk_math \
-    :jdk_jdi
+    :jdk_jdi \
+    :jdk_security_infra
 
 jdk_tier2 = \
     :jdk_io \
@@ -162,6 +163,7 @@ jdk_security3 = \
     sun/security \
     -sun/security/krb5 \
     -sun/security/jgss \
+    -sun/security/lib/cacerts \
     javax/net \
     lib/security
 
@@ -178,7 +180,8 @@ jdk_security = \
     :jdk_security4
 
 jdk_security_infra = \
-    security/infra/java/security/cert/CertPathValidator/certification
+    security/infra/java/security/cert/CertPathValidator/certification \
+    sun/security/lib/cacerts
 
 jdk_text = \
     java/text \