diff --git a/openjdk/excludes/ProblemList_openjdk24-openj9.txt b/openjdk/excludes/ProblemList_openjdk24-openj9.txt
index 0a615df90a..8ff92d1b4a 100644
--- a/openjdk/excludes/ProblemList_openjdk24-openj9.txt
+++ b/openjdk/excludes/ProblemList_openjdk24-openj9.txt
@@ -216,6 +216,8 @@ sun/management/jmxremote/startstop/JMXStatusTest.java     https://github.com/ado
 
 # jdk_jmx
 
+javax/management/security/HashedPasswordFileTest.java https://github.com/eclipse-openj9/openj9/issues/21138 generic-all
+
 ############################################################################
 
 # jdk_math
diff --git a/openjdk/excludes/ProblemList_openjdk25-openj9.txt b/openjdk/excludes/ProblemList_openjdk25-openj9.txt
index 65d665b2c3..fca2dd14fa 100644
--- a/openjdk/excludes/ProblemList_openjdk25-openj9.txt
+++ b/openjdk/excludes/ProblemList_openjdk25-openj9.txt
@@ -194,6 +194,8 @@ sun/management/jmxremote/startstop/JMXStatusTest.java     https://github.com/ado
 
 # jdk_jmx
 
+javax/management/security/HashedPasswordFileTest.java https://github.com/eclipse-openj9/openj9/issues/21138 generic-all
+
 ############################################################################
 
 # jdk_math