diff --git a/functional/MBCS_Tests/formatter/playlist.xml b/functional/MBCS_Tests/formatter/playlist.xml
index 0f7838083a..ec6fe35298 100644
--- a/functional/MBCS_Tests/formatter/playlist.xml
+++ b/functional/MBCS_Tests/formatter/playlist.xml
@@ -72,7 +72,6 @@ limitations under the License.
 				<comment>https://github.com/adoptium/aqa-tests/issues/5148</comment>
 				<version>22+</version>
 				<impl>hotspot</impl>
-				<platform>s390x_linux</platform>
 			</disable>
 		</disables>
 		<platformRequirements>os.linux</platformRequirements>
diff --git a/functional/MBCS_Tests/i18n/playlist.xml b/functional/MBCS_Tests/i18n/playlist.xml
index 2f323e980d..d88f20b9de 100644
--- a/functional/MBCS_Tests/i18n/playlist.xml
+++ b/functional/MBCS_Tests/i18n/playlist.xml
@@ -37,7 +37,6 @@ limitations under the License.
 				<comment>https://github.com/adoptium/aqa-tests/issues/5148</comment>
 				<version>22+</version>
 				<impl>hotspot</impl>
-				<platform>s390x_linux</platform>
 			</disable>
 			<disable>
 				<comment>https://github.com/eclipse-openj9/openj9/issues/19083</comment>
diff --git a/openjdk/excludes/ProblemList_openjdk23.txt b/openjdk/excludes/ProblemList_openjdk23.txt
index 04e116ba67..5f90c3813c 100644
--- a/openjdk/excludes/ProblemList_openjdk23.txt
+++ b/openjdk/excludes/ProblemList_openjdk23.txt
@@ -18,21 +18,32 @@
 
 # jdk_beans
 
-java/beans/PropertyEditor/6380849/TestPropertyEditor.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestColorClass.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestColorClassJava.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestColorClassNull.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestColorClassValue.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestFontClass.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
+# java/beans/PropertyEditor/6380849/TestPropertyEditor.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestColorClass.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestColorClassJava.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestColorClassNull.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestColorClassValue.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestFontClass.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestFontClassJava.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestFontClassNull.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestFontClassValue.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/XMLEncoder/java_awt_ScrollPane.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+
+java/beans/PropertyEditor/6380849/TestPropertyEditor.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestColorClass.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestColorClassJava.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestColorClassNull.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestColorClassValue.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestFontClass.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
 # java/beans/PropertyEditor/TestFontClassJava.java https://github.com/adoptium/aqa-tests/issues/2138 linux-all
 # java/beans/PropertyEditor/TestFontClassValue.java https://github.com/adoptium/aqa-tests/issues/2138 linux-all
-java/beans/PropertyEditor/TestFontClassJava.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,linux-all
-java/beans/PropertyEditor/TestFontClassNull.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestFontClassValue.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,linux-all
+java/beans/PropertyEditor/TestFontClassJava.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,linux-all,windows-all
+java/beans/PropertyEditor/TestFontClassNull.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestFontClassValue.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,linux-all,windows-all
 java/beans/XMLEncoder/java_awt_CardLayout.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all
 java/beans/XMLEncoder/java_awt_GridBagLayout.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all
 # java/beans/XMLEncoder/java_awt_ScrollPane.java https://github.com/adoptium/aqa-tests/issues/2848 macosx-all
-java/beans/XMLEncoder/java_awt_ScrollPane.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all,macosx-all
+java/beans/XMLEncoder/java_awt_ScrollPane.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all,macosx-all,windows-all
 java/beans/XMLEncoder/javax_swing_Box.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all
 java/beans/XMLEncoder/javax_swing_BoxLayout.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all
 java/beans/XMLEncoder/javax_swing_Box_Filler.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all
@@ -414,6 +425,7 @@ javax/management/remote/mandatory/util/MapNullValuesTest.java https://github.com
 # jdk_imageio
 
 javax/imageio/plugins/shared/ImageWriterCompressionTest.java https://github.com/adoptium/aqa-tests/issues/2138 linux-all
+javax/imageio/plugins/jpeg/JPEGsNotAcceleratedTest.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
 
 ############################################################################
 
diff --git a/openjdk/excludes/ProblemList_openjdk24.txt b/openjdk/excludes/ProblemList_openjdk24.txt
index 04e116ba67..5f90c3813c 100644
--- a/openjdk/excludes/ProblemList_openjdk24.txt
+++ b/openjdk/excludes/ProblemList_openjdk24.txt
@@ -18,21 +18,32 @@
 
 # jdk_beans
 
-java/beans/PropertyEditor/6380849/TestPropertyEditor.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestColorClass.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestColorClassJava.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestColorClassNull.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestColorClassValue.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestFontClass.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
+# java/beans/PropertyEditor/6380849/TestPropertyEditor.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestColorClass.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestColorClassJava.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestColorClassNull.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestColorClassValue.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestFontClass.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestFontClassJava.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestFontClassNull.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/PropertyEditor/TestFontClassValue.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+# java/beans/XMLEncoder/java_awt_ScrollPane.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
+
+java/beans/PropertyEditor/6380849/TestPropertyEditor.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestColorClass.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestColorClassJava.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestColorClassNull.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestColorClassValue.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestFontClass.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
 # java/beans/PropertyEditor/TestFontClassJava.java https://github.com/adoptium/aqa-tests/issues/2138 linux-all
 # java/beans/PropertyEditor/TestFontClassValue.java https://github.com/adoptium/aqa-tests/issues/2138 linux-all
-java/beans/PropertyEditor/TestFontClassJava.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,linux-all
-java/beans/PropertyEditor/TestFontClassNull.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all
-java/beans/PropertyEditor/TestFontClassValue.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,linux-all
+java/beans/PropertyEditor/TestFontClassJava.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,linux-all,windows-all
+java/beans/PropertyEditor/TestFontClassNull.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,windows-all
+java/beans/PropertyEditor/TestFontClassValue.java https://bugs.openjdk.java.net/browse/JDK-8173082 macosx-all,linux-all,windows-all
 java/beans/XMLEncoder/java_awt_CardLayout.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all
 java/beans/XMLEncoder/java_awt_GridBagLayout.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all
 # java/beans/XMLEncoder/java_awt_ScrollPane.java https://github.com/adoptium/aqa-tests/issues/2848 macosx-all
-java/beans/XMLEncoder/java_awt_ScrollPane.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all,macosx-all
+java/beans/XMLEncoder/java_awt_ScrollPane.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all,macosx-all,windows-all
 java/beans/XMLEncoder/javax_swing_Box.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all
 java/beans/XMLEncoder/javax_swing_BoxLayout.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all
 java/beans/XMLEncoder/javax_swing_Box_Filler.java https://github.com/adoptium/aqa-tests/issues/2810 aix-all
@@ -414,6 +425,7 @@ javax/management/remote/mandatory/util/MapNullValuesTest.java https://github.com
 # jdk_imageio
 
 javax/imageio/plugins/shared/ImageWriterCompressionTest.java https://github.com/adoptium/aqa-tests/issues/2138 linux-all
+javax/imageio/plugins/jpeg/JPEGsNotAcceleratedTest.java https://bugs.openjdk.org/browse/JDK-8336862 windows-all
 
 ############################################################################