diff --git a/tests/gpgscm/init.scm b/tests/gpgscm/init.scm
index 57ae07986..3c0ee7d91 100644
--- a/tests/gpgscm/init.scm
+++ b/tests/gpgscm/init.scm
@@ -577,7 +577,8 @@
                     (pop-handler)
                     ,label)))))
 
-(define *error-hook* throw)
+(define (*error-hook* . args)
+  (throw args))
 
 
 ;;;;; Definition of MAKE-ENVIRONMENT, to be used with two-argument EVAL