diff --git a/ansi-tests/invoke-debugger.lsp b/ansi-tests/invoke-debugger.lsp
index 405ee797edeb7d1f231df21c4fa2db400c6f7651..d4c66109e08cd752fb74517a1adfd31fcc417a73 100644
--- a/ansi-tests/invoke-debugger.lsp
+++ b/ansi-tests/invoke-debugger.lsp
@@ -23,11 +23,21 @@
   good)
 
 (deftest invoke-debugger.error.1
-  (classify-error (invoke-debugger))
+  (classify-error
+   (block done
+     (let ((*debugger-hook* #'(lambda (&rest args)
+				(declare (ignore args))
+				(return-from done 'bad))))
+       (invoke-debugger))))
   program-error)
 
 (deftest invoke-debugger.error.2
-  (classify-error (invoke-debugger (make-condition 'simple-error) nil))
+  (classify-error
+   (block done
+     (let ((*debugger-hook* #'(lambda (&rest args)
+				(declare (ignore args))
+				(return-from done 'bad))))
+       (invoke-debugger (make-condition 'simple-error) nil))))
   program-error)
 
 ;;; If the debugger hook function expects the wrong number