diff -r 09e328af295a -r ad578adff5df hotspot/src/share/vm/runtime/globals.hpp
--- a/hotspot/src/share/vm/runtime/globals.hpp	Thu Feb 23 11:57:07 2017 +0100
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Thu Feb 23 15:59:14 2017 -0500
@@ -935,6 +935,9 @@
   notproduct(bool, TestSafeFetchInErrorHandler, false,                      \
           "If true, tests SafeFetch inside error handler.")                 \
                                                                             \
+  notproduct(bool, TestUnresponsiveErrorHandler, false,                     \
+          "If true, simulates an unresponsive error handler.")              \
+                                                                            \
   develop(bool, Verbose, false,                                             \
           "Print additional debugging information from other modes")        \
                                                                             \