diff --git a/test/jdk/ProblemList-fips.txt b/test/jdk/ProblemList-fips.txt
index db2984c4603..b77b6a12d2c 100644
--- a/test/jdk/ProblemList-fips.txt
+++ b/test/jdk/ProblemList-fips.txt
@@ -571,21 +571,21 @@ com/sun/org/apache/xml/internal/security/ShortECDSA.java	https://github.com/ibmr
 
 # Module java.security.sasl related. Unable to find client impl for CRAM-MD5 or DIGEST-MD5.
 
-com/sun/security/sasl/ntlm/NTLMTest.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/ntlm/Conformance.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/digest/Unbound.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/digest/PrivacyRc4.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/digest/Privacy.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/digest/NoQuoteParams.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/digest/Integrity.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/digest/CheckNegotiatedQOPs.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/digest/AuthRealms.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/digest/AuthRealmChoices.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/digest/AuthOnly.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/digest/AuthNoUtf8.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-com/sun/security/sasl/Cram.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-javax/security/sasl/Sasl/DisabledMechanisms.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
-javax/security/sasl/Sasl/ClientServerTest.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/ntlm/NTLMTest.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/ntlm/Conformance.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/digest/Unbound.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/digest/PrivacyRc4.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/digest/Privacy.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/digest/NoQuoteParams.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/digest/Integrity.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/digest/CheckNegotiatedQOPs.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/digest/AuthRealms.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/digest/AuthRealmChoices.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/digest/AuthOnly.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/digest/AuthNoUtf8.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#com/sun/security/sasl/Cram.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#javax/security/sasl/Sasl/DisabledMechanisms.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
+#javax/security/sasl/Sasl/ClientServerTest.java	https://github.com/ibmruntimes/openj9-openjdk-jdk11/issues/547	linux-x64
 
 # NoSuchAlgorithmException: JKS KeyStore not available or KeyStore file related.