diff --git a/test/ProblemList.txt b/test/ProblemList.txt
index 35aaa99f931e151a6f729165cc28a4697c276f97..23c91cf3a922bc4e895afb82ada4d99494929a84 100644
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -143,6 +143,11 @@ java/lang/management/MemoryMXBean/CollectionUsageThresholdSerialGC.sh generic-al
 java/lang/management/MemoryMXBean/MemoryTest.java		generic-all
 java/lang/management/MemoryMXBean/MemoryTestAllGC.sh		generic-all
 
+# Exclude until hotspot/jdk repos are sync'd w.r.t. JAVA_MAX_SUPPORTED_VERSION
+# Needed when hotspot fix 7054345 is present.  Remove when the JDK source is 
+# updated accordingly.
+java/lang/System/Versions.java   generic-all
+
 ############################################################################
 
 # jdk_management