diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 13e1ea30a34..d1d500ee05e 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -74,6 +74,7 @@ compiler/floatingpoint/TestSubnormalDouble.java 8317810 generic-i586
 compiler/codecache/CodeCacheFullCountTest.java 8332954 generic-all
 
 compiler/interpreter/Test6833129.java 8335266 generic-i586
+compiler/intrinsics/TestReturnOopSetForJFRWriteCheckpoint.java 8286300 linux-s390x
 
 compiler/c2/aarch64/TestStaticCallStub.java 8359963 linux-aarch64,macosx-aarch64
 
@@ -110,6 +111,7 @@ runtime/StackGuardPages/TestStackGuardPagesNative.java 8303612 linux-all
 runtime/ErrorHandling/MachCodeFramesInErrorFile.java 8313315 linux-ppc64le
 runtime/NMT/VirtualAllocCommitMerge.java 8309698 linux-s390x
 
+applications/ctw/modules/jdk_jfr.java 8286300 linux-s390x
 applications/jcstress/copy.java 8229852 linux-all
 
 containers/docker/TestJcmd.java 8278102 linux-all
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 291b2163b0d..0d19dc9a2aa 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -709,6 +709,24 @@ jdk/incubator/vector/LoadJsvmlTest.java                         8305390 windows-
 
 # jdk_jfr
 
+jdk/jfr/api/consumer/TestRecordingFileWrite.java                8286300 linux-s390x
+jdk/jfr/api/consumer/streaming/TestCrossProcessStreaming.java   8286300 linux-s390x
+jdk/jfr/api/consumer/streaming/TestFilledChunks.java            8286300 linux-s390x
+jdk/jfr/api/consumer/streaming/TestRemovedChunks.java           8286300 linux-s390x
+jdk/jfr/api/recording/misc/TestGetStreamWithFailure.java        8286300 linux-s390x
+jdk/jfr/api/settings/TestSettingControl.java                    8286300 linux-s390x
+jdk/jfr/event/runtime/TestBackToBackSensitive.java              8286300 linux-s390x
+jdk/jfr/event/runtime/TestSyncOnValueBasedClassEvent.java       8286300 linux-s390x
+jdk/jfr/event/tracing/TestMultipleThreads.java                  8286300 linux-s390x
+jdk/jfr/event/tracing/TestTracedString.java                     8286300 linux-s390x
+jdk/jfr/javaagent/TestLoadedAgent.java                          8286300 linux-s390x
+jdk/jfr/javaagent/TestPremainAgent.java                         8286300 linux-s390x
+jdk/jfr/jmx/streaming/TestClose.java                            8286300 linux-s390x
+jdk/jfr/jmx/streaming/TestMaxSize.java                          8286300 linux-s390x
+jdk/jfr/jvm/TestChunkIntegrity.java                             8286300 linux-s390x
+jdk/jfr/jvm/TestJFRIntrinsic.java                               8286300 linux-s390x
+jdk/jfr/tool/TestDisassemble.java                               8286300 linux-s390x
+jdk/jfr/tool/TestScrub.java                                     8286300 linux-s390x
 jdk/jfr/event/compiler/TestCodeSweeper.java                     8338127 generic-all
 jdk/jfr/event/oldobject/TestShenandoah.java                     8342951 generic-all
 jdk/jfr/event/runtime/TestResidentSetSizeEvent.java             8309846 aix-ppc64