diff --git a/functional/MockitoTests/build.xml b/functional/MockitoTests/build.xml
index 6125f000fe..79d12a8014 100644
--- a/functional/MockitoTests/build.xml
+++ b/functional/MockitoTests/build.xml
@@ -19,7 +19,7 @@ limitations under the License.
Mockito Tests
-
+
@@ -45,6 +45,7 @@ limitations under the License.
+
diff --git a/functional/MockitoTests/playlist.xml b/functional/MockitoTests/playlist.xml
index 9add7cf19d..eeadef49bc 100644
--- a/functional/MockitoTests/playlist.xml
+++ b/functional/MockitoTests/playlist.xml
@@ -39,4 +39,29 @@
11+
+
+ MockitoJunitTest
+
+
+ https://github.com/eclipse-openj9/openj9/issues/19331
+ .*zos.*
+
+
+ https://github.com/eclipse-openj9/openj9/issues/19354
+ 23+
+
+
+
+ $(JAVA_COMMAND) $(JVM_OPTIONS) -cp $(Q)$(RESOURCES_DIR)$(P)$(TEST_RESROOT)$(D)MockitoTests.jar$(P)$(LIB_DIR)$(D)mockito-core.jar$(P)$(LIB_DIR)$(D)byte-buddy.jar$(P)$(LIB_DIR)$(D)byte-buddy-agent.jar$(P)$(LIB_DIR)$(D)objenesis.jar$(P)$(LIB_DIR)$(D)junit-jupiter-api.jar$(Q) test.java.MockitoJunitTest ; \
+ $(TEST_STATUS)
+
+ extended
+
+
+ functional
+
+
+ 11+
+
+
\ No newline at end of file
diff --git a/functional/MockitoTests/src/test/java/MockitoJunitTest.java b/functional/MockitoTests/src/test/java/MockitoJunitTest.java
new file mode 100644
index 0000000000..965e2efbe8
--- /dev/null
+++ b/functional/MockitoTests/src/test/java/MockitoJunitTest.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *******************************************************************************/
+package test.java;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+class MockitoJunitTest {
+
+ class Some {}
+
+ @Test
+ public void reproduceCrash() {
+ System.out.println("Call Mockito.mock(Some.class)");
+ Mockito.mock(Some.class);
+ }
+
+ public static void main(String[] args) {
+
+ }
+
+}
\ No newline at end of file