diff --git a/openjdk/excludes/ProblemList_openjdk8-openj9.txt b/openjdk/excludes/ProblemList_openjdk8-openj9.txt
index ec8028d6bb..94395ec940 100644
--- a/openjdk/excludes/ProblemList_openjdk8-openj9.txt
+++ b/openjdk/excludes/ProblemList_openjdk8-openj9.txt
@@ -300,6 +300,19 @@ sun/security/krb5/auto/Unreachable.java https://github.com/eclipse-openj9/openj9
############################################################################
+# jdk_security_infra
+
+security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+
+############################################################################
+
# jdk_sound
javax/sound/midi/Devices/InitializationHang.java https://github.com/adoptium/aqa-tests/issues/227 generic-all
diff --git a/openjdk/excludes/ProblemList_openjdk8.txt b/openjdk/excludes/ProblemList_openjdk8.txt
index dbe721284a..2ae5b226fb 100644
--- a/openjdk/excludes/ProblemList_openjdk8.txt
+++ b/openjdk/excludes/ProblemList_openjdk8.txt
@@ -313,6 +313,18 @@ sun/security/krb5/auto/Unreachable.java https://github.com/adoptium/aqa-tests/is
############################################################################
+# jdk_security_infra
+
+security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all
+
+############################################################################
# jdk_sound
javax/sound/midi/Devices/InitializationHang.java https://github.com/adoptium/aqa-tests/issues/136 generic-all
diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml
index fcedd8a487..3c51054afa 100644
--- a/openjdk/playlist.xml
+++ b/openjdk/playlist.xml
@@ -1802,10 +1802,6 @@
${VENDOR_PROBLEM_LIST_FILE} \
$(Q)$(JTREG_JDK_TEST_DIR):jdk_imageio$(Q); \
$(TEST_STATUS)
-
- 8
- 11+
-
extended
@@ -1873,9 +1869,6 @@
${VENDOR_PROBLEM_LIST_FILE} \
$(Q)$(JTREG_JDK_TEST_DIR):jdk_security_infra$(Q); \
$(TEST_STATUS)
-
- 11+
-
extended