diff --git a/openjdk/openjdk.mk b/openjdk/openjdk.mk
index 8e8ac6b8b9..91692771c2 100644
--- a/openjdk/openjdk.mk
+++ b/openjdk/openjdk.mk
@@ -172,9 +172,11 @@ endif
JDK_CUSTOM_TARGET ?= java/math/BigInteger/BigIntegerTest.java
HOTSPOT_CUSTOM_TARGET ?= gc/stress/gclocker/TestExcessGCLockerCollections.java
+HOTSPOT_CUSTOM_J9_TARGET ?= serviceability/jvmti/GetSystemProperty/JvmtiGetSystemPropertyTest.java
LANGTOOLS_CUSTOM_TARGET ?= tools/javac/4241573/T4241573.java
FULLPATH_JDK_CUSTOM_TARGET = $(foreach target,$(JDK_CUSTOM_TARGET),$(JTREG_JDK_TEST_DIR)$(D)$(target))
FULLPATH_HOTSPOT_CUSTOM_TARGET = $(foreach target,$(HOTSPOT_CUSTOM_TARGET),$(JTREG_HOTSPOT_TEST_DIR)$(D)$(target))
+FULLPATH_HOTSPOT_CUSTOM_J9_TARGET = $(foreach target,$(HOTSPOT_CUSTOM_J9_TARGET),$(JTREG_HOTSPOT_TEST_DIR)$(D)$(target))
JDK_NATIVE_OPTIONS :=
JVM_NATIVE_OPTIONS :=
diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml
index 4098e764e8..69d1c362af 100644
--- a/openjdk/playlist.xml
+++ b/openjdk/playlist.xml
@@ -96,23 +96,13 @@
hotspot_custom
-
-
- https://github.com/adoptium/aqa-tests/issues/5357
- openj9
-
-
- https://github.com/adoptium/aqa-tests/issues/5357
- ibm
-
-
Mode150
Mode650
Mode1000
$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
- $(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
+ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
$(TIMEOUT_HANDLER) \
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
@@ -125,6 +115,38 @@
openjdk
+
+ hotspot
+
+
+
+ hotspot_custom_j9
+
+ Mode150
+ Mode650
+ Mode1000
+
+ $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
+ $(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
+ $(TIMEOUT_HANDLER) \
+ -w $(Q)$(REPORTDIR)$(D)work$(Q) \
+ -r $(Q)$(REPORTDIR)$(D)report$(Q) \
+ -jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
+ $(FULLPATH_HOTSPOT_CUSTOM_J9_TARGET); \
+ $(TEST_STATUS)
+
+ 21+
+
+
+ special
+
+
+ openjdk
+
+
+ openj9
+ ibm
+
hotspot_container