diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index e34d372ee..9a0037ff7 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-05  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	* lib.scm (run-test-exception):  Preserve the original error's
+	stack for re-throwing.
+
 2001-03-04  Marius Vollmer  <mvo@zagadka.ping.de>
 
 	* tests/syntax.test ("let,duplicate bindings", "let*,duplicate
@@ -29,7 +34,6 @@
 	related to evaluation and application to tests/eval.test.
 
 	* tests/exceptions.test:  Added some test cases that check guile's
-	
 	exception handling.
 
 2001-03-01  Dirk Herrmann  <D.Herrmann@tu-bs.de>
diff --git a/test-suite/lib.scm b/test-suite/lib.scm
index 6cc48f24d..2ef8aee45 100644
--- a/test-suite/lib.scm
+++ b/test-suite/lib.scm
@@ -17,6 +17,7 @@
 ;;;; Boston, MA 02111-1307 USA
 
 (define-module (test-suite lib)
+  :use-module (ice-9 stack-catch)
   :use-module (ice-9 regex))
 
 (export
@@ -284,7 +285,7 @@
 (define (run-test-exception name exception expect-pass thunk)
   (run-test name expect-pass
     (lambda ()
-      (catch (car exception)
+      (stack-catch (car exception)
 	(lambda () (thunk) #f)
 	(lambda (key proc message . rest) 
 	  (if (not (string-match (cdr exception) message))