diff --git a/test-suite/tests/elisp.test b/test-suite/tests/elisp.test
index 067f7b16f..28ec05412 100644
--- a/test-suite/tests/elisp.test
+++ b/test-suite/tests/elisp.test
@@ -19,6 +19,10 @@
   :use-module (test-suite lib)
   :use-module (ice-9 weak-vector))
 
+(define *old-stack-level* (and=> (memq 'stack (debug-options)) cadr))
+(if *old-stack-level*
+    (debug-set! stack (* 2 *old-stack-level*)))
+
 ;;;
 ;;; elisp
 ;;;
@@ -331,4 +335,6 @@
 
       ))
 
+(debug-set! stack *old-stack-level*)
+
 ;;; elisp.test ends here