diff --git a/collects/tests/lazy/testing.ss b/collects/tests/eli-tester.ss
similarity index 100%
rename from collects/tests/lazy/testing.ss
rename to collects/tests/eli-tester.ss
diff --git a/collects/tests/lazy/main.ss b/collects/tests/lazy/main.ss
index 43277e01f4..0399be1dee 100644
--- a/collects/tests/lazy/main.ss
+++ b/collects/tests/lazy/main.ss
@@ -1,6 +1,8 @@
 #lang scheme/base
 
-(require "testing.ss" lazy/force)
+(require tests/eli-tester lazy/force)
+
+(test
 
 ;; lazy/force behavior
 (test
@@ -46,4 +48,4 @@
    => "#0=#s(foo 1 #0#)"
    ))
 
-(printf "All tests passed.\n")
+)
diff --git a/collects/tests/run-automated-tests.ss b/collects/tests/run-automated-tests.ss
index 232e124671..cb89a914c4 100755
--- a/collects/tests/run-automated-tests.ss
+++ b/collects/tests/run-automated-tests.ss
@@ -32,7 +32,9 @@
   '([load "mzscheme/quiet.ss" (lib "scheme/init")]
     [require "typed-scheme/main.ss"]
     [require "match/plt-match-tests.ss"]
-    [require "stepper/automatic-tests.ss" (lib "scheme/base")]))
+    ;; [require "stepper/automatic-tests.ss" (lib "scheme/base")]
+    [require "lazy/main.ss"]
+    ))
 
 
 (require scheme/runtime-path)
@@ -62,8 +64,9 @@
                      (lambda (n) (abort n "exit with error code ~a" n))]
                     [uncaught-exception-handler
                      (lambda (exn)
-                       (when (eq? orig-exn-handler (uncaught-exception-handler))
-                         (abort 1 "error: ~a" (exn-message exn))))]
+                       (if (eq? orig-exn-handler (uncaught-exception-handler))
+                         (abort 1 "error: ~a" (exn-message exn))
+                         (orig-exn-handler exn)))]
                     [current-namespace (make-base-empty-namespace)])
       (for-each namespace-require (cddr t))
       ((case (car t) [(load) load] [(require) namespace-require])