diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp
index 439a3710185..117d27997ee 100644
--- a/src/hotspot/share/gc/z/zVerify.cpp
+++ b/src/hotspot/share/gc/z/zVerify.cpp
@@ -61,7 +61,7 @@
 // with callers to this function. Typically used to verify that object oops
 // and headers are safe to access.
 void z_verify_safepoints_are_blocked() {
-  if (VMError::is_error_reported_in_current_thread()) {
+  if (VMError::is_error_reported() && VMError::is_error_reported_in_current_thread()) {
     // The current thread has crashed and is creating an error report.
     // This may occur from any thread state, skip the safepoint_are_blocked
     // verification.
diff --git a/test/jdk/ProblemList-zgc.txt b/test/jdk/ProblemList-zgc.txt
index 2bd7691be10..ab44c5e47a9 100644
--- a/test/jdk/ProblemList-zgc.txt
+++ b/test/jdk/ProblemList-zgc.txt
@@ -38,4 +38,3 @@ sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java 8307393   generic-all
 sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java 8307393   generic-all
 
 com/sun/jdi/ThreadMemoryLeakTest.java              8307402   generic-all
-com/sun/jdi/JdbStopInNotificationThreadTest.java   8351607   linux-all