diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
index 1322fdd023..441f3fe8bf 100644
--- a/buildenv/jenkins/JenkinsfileBase
+++ b/buildenv/jenkins/JenkinsfileBase
@@ -728,7 +728,8 @@ def runTest( ) {
 				env.SYSTEM_CUSTOM_TARGET=CUSTOM_TARGET
 			} else {
 				// remove suffix, then set CUSTOM_OPTION (i.e., jdk_custom_0 will become jdk_custom)
-				def removeSuffix = TARGET.replaceAll(/_\d+$/, "")
+				def removeDisabled = TARGET.replaceAll("disabled.", "")
+				def removeSuffix = removeDisabled.replaceAll(/_\d+$/, "")
 				CUSTOM_OPTION = "${removeSuffix.toUpperCase()}_TARGET='${CUSTOM_TARGET}'"
 			}
 		}
diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml
index 1d3e60c9bb..03022c7b11 100644
--- a/openjdk/playlist.xml
+++ b/openjdk/playlist.xml
@@ -115,9 +115,16 @@
 		<groups>
 			<group>openjdk</group>
 		</groups>
-		<impls>
-			<impl>hotspot</impl>
-		</impls>
+		<disables>
+			<disable>
+				<comment>https://github.com/adoptium/aqa-tests/issues/5357</comment>
+				<impl>openj9</impl>
+			</disable>
+			<disable>
+				<comment>https://github.com/adoptium/aqa-tests/issues/5357</comment>
+				<impl>ibm</impl>
+			</disable>
+		</disables>
 	</test>
 	<test>
 		<testCaseName>hotspot_container</testCaseName>