diff --git a/test/hotspot/jtreg/ProblemList-enable-preview.txt b/test/hotspot/jtreg/ProblemList-enable-preview.txt
index caed1d5edbd..a07d006a474 100644
--- a/test/hotspot/jtreg/ProblemList-enable-preview.txt
+++ b/test/hotspot/jtreg/ProblemList-enable-preview.txt
@@ -40,5 +40,7 @@ compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJav
 
 # Serviceability:
 vmTestbase/nsk/jdi/Accessible/modifiers/modifiers001/TestDescription.java                        8375069 generic-all
-
+serviceability/sa/ClhsdbDumpheap.java                                                            8379925 generic-all
 serviceability/sa/TestHeapDumpForInvokeDynamic.java                                              8377387 generic-all
+serviceability/sa/TestJmapCore.java                                                              8379925 generic-all
+serviceability/sa/TestJmapCoreMetaspace.java                                                     8379925 generic-all
diff --git a/test/jdk/ProblemList-enable-preview.txt b/test/jdk/ProblemList-enable-preview.txt
index 5345d4b2e90..e21a4b2b75d 100644
--- a/test/jdk/ProblemList-enable-preview.txt
+++ b/test/jdk/ProblemList-enable-preview.txt
@@ -33,3 +33,7 @@
 # Valhalla failures start here:
 com/sun/jdi/EATests.java#id0                                       8372831 generic-all
 java/lang/Thread/virtual/stress/Skynet.java#Z                      8342977 generic-all
+
+sun/tools/jhsdb/HeapDumpTest.java                                  8379925 generic-all
+sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java                 8379925 generic-all
+sun/tools/jhsdb/JShellHeapDumpTest.java                            8379925 generic-all