diff --git a/collects/lang/htdp-langs.ss b/collects/lang/htdp-langs.ss
index 822ce38e3f..b3dc177027 100644
--- a/collects/lang/htdp-langs.ss
+++ b/collects/lang/htdp-langs.ss
@@ -168,7 +168,6 @@
                  (namespace-attach-module drs-namespace scheme-test-module-name)
                  (namespace-require scheme-test-module-name)
                  (scheme-test-data (list (drscheme:rep:current-rep) drs-eventspace test-display%))
-                 (error-handler teaching-languages-error-display-handler)
                  (test-execute (get-preference 'tests:enable? (lambda () #t)))
                  (test-format (make-formatter (lambda (v o) (render-value/format v settings o 40))))
                  )))
diff --git a/collects/test-engine/scheme-tests.ss b/collects/test-engine/scheme-tests.ss
index fa11b9233c..3088394b70 100644
--- a/collects/test-engine/scheme-tests.ss
+++ b/collects/test-engine/scheme-tests.ss
@@ -187,11 +187,14 @@
 ;;                ( -> scheme-val) scheme-val scheme-val object symbol? -> void
 (define (run-and-check check maker test expect range src test-info kind)
   (match-let ([(list result result-val exn?)
-               (with-handlers ([exn? (lambda (e)
-                                       #;((error-display-handler) (exn-message e) e)
-                                       (list (make-unexpected-error src expect
-                                                                    (exn-message e) 
-                                                                    e) 'error (lambda () (test))))])
+               (with-handlers ([exn? (lambda (e) (raise e)
+                                       (let ([display (error-display-handler)])
+                                         #;((error-display-handler) (exn-message e) e)
+                                         (list (make-unexpected-error src expect
+                                                                      (exn-message e) 
+                                                                      e) 'error (lambda () 
+                                                                                  (printf "~a~n" e)
+                                                                                  (display (exn-message e) e)))))])
                  (let ([test-val (test)])
                    (cond [(check expect test-val range) (list #t test-val #f)]
                          [else 
@@ -291,7 +294,6 @@
 (define (insert-test test-info test) (send test-info add-test test))
 
 (define scheme-test-data (make-parameter (list #f #f #f)))
-#;(define scheme-error-handler (make-parameter (error-display-handler)))
 
 (define scheme-test%
   (class* test-engine% ()
diff --git a/collects/test-engine/test-display.scm b/collects/test-engine/test-display.scm
index 55cba9cb50..a34d9cb0fd 100644
--- a/collects/test-engine/test-display.scm
+++ b/collects/test-engine/test-display.scm
@@ -160,8 +160,7 @@
         (when (and src-editor current-rep)
           (send text set-clickback
                 start (send text get-end-position)
-                (lambda (t s e) (parameterize ([error-display-handler (error-handler)])
-                                  (exn)))
+                (lambda (t s e) ((error-handler) exn))
                 #f #f)
           (let ([end (send text get-end-position)]
                 [c (new style-delta%)])
diff --git a/collects/test-engine/test-engine.scm b/collects/test-engine/test-engine.scm
index 953a118b82..66165d5577 100644
--- a/collects/test-engine/test-engine.scm
+++ b/collects/test-engine/test-engine.scm
@@ -166,7 +166,7 @@
 
 (define test-format (make-parameter (lambda (v) (format "~a" v))))
 (define test-execute (make-parameter #t))
-(define error-handler (make-parameter (error-display-handler)))
+(define error-handler (make-parameter (lambda (e) (e))))
 (define test-silence (make-parameter #f))
 
 (provide test-engine% test-display-textual% test-format error-handler test-execute test-silence)