diff --git a/collects/tests/mred/dc.ss b/collects/tests/mred/dc.ss
index d53584c7..9b76552e 100644
--- a/collects/tests/mred/dc.ss
+++ b/collects/tests/mred/dc.ss
@@ -12,7 +12,7 @@
 (test #t 'is-color? (send bm is-color?))
 
 (define (bad m . args)
-  (with-handlers ([exn:application:mismatch?
+  (with-handlers ([exn:fail:contract?
 		   (lambda (x)
 		     (test '("ok")
 			   `(send <bad-dc> ,m ...)
diff --git a/collects/tests/mred/editor.ss b/collects/tests/mred/editor.ss
index ff6d20d7..18776479 100644
--- a/collects/tests/mred/editor.ss
+++ b/collects/tests/mred/editor.ss
@@ -90,8 +90,8 @@
     (test '(1 5 6) 'pos (call-with-values (lambda () (port-next-location p)) list))
     (test 'there 'read (read p))
     (test '(1 11 12) 'pos (call-with-values (lambda () (port-next-location p)) list))
-    (test 'got-ack 'read (with-handlers ([not-break-exn? (lambda (x)
-							   'got-ack)])
+    (test 'got-ack 'read (with-handlers ([exn:fail? (lambda (x)
+						      'got-ack)])
 			   (read p)))
     (test '(1 12 13) 'pos (call-with-values (lambda () (port-next-location p)) list))
     (test eof 'read (read p)))
diff --git a/collects/tests/mred/loadtest.ss b/collects/tests/mred/loadtest.ss
index 439dec9e..d6014052 100644
--- a/collects/tests/mred/loadtest.ss
+++ b/collects/tests/mred/loadtest.ss
@@ -1,5 +1,5 @@
 
-(unless (with-handlers ([not-break-exn? (lambda (x) #f)])
+(unless (with-handlers ([exn:fail? (lambda (x) #f)])
 	  (namespace-variable-binding 'SECTION)
 	  #t)
   (load-relative "testing.ss"))
diff --git a/collects/tests/mred/paramz.ss b/collects/tests/mred/paramz.ss
index 7fa3b1d9..a74786bf 100644
--- a/collects/tests/mred/paramz.ss
+++ b/collects/tests/mred/paramz.ss
@@ -90,7 +90,7 @@
    'error
    'shutdown-eventspace
    (with-handlers ([(lambda (x)
-		      (and (exn:misc? x)
+		      (and (exn:fail? x)
 			   (regexp-match "shutdown" (exn-message x))))
 		    (lambda (x)
 		      (printf "got expected error: ~a~n" (exn-message x))
diff --git a/collects/tests/mred/testing.ss b/collects/tests/mred/testing.ss
index 55b08736..d3284474 100644
--- a/collects/tests/mred/testing.ss
+++ b/collects/tests/mred/testing.ss
@@ -19,11 +19,11 @@
       [(_ expr)
        (syntax
 	(test 'was-mismatch 'mismtach
-	      (with-handlers ([exn:application:mismatch?
+	      (with-handlers ([exn:fail:contract?
 			       (lambda (x)
 				 (fprintf (current-error-port) "~a~n" (exn-message x))
 				 'was-mismatch)]
-			      [not-break-exn? values])
+			      [exn:fail? values])
 		expr)))])))
 
 (define-syntax st
diff --git a/collects/tests/mred/windowing.ss b/collects/tests/mred/windowing.ss
index 7ae12bdc..a1f489c3 100644
--- a/collects/tests/mred/windowing.ss
+++ b/collects/tests/mred/windowing.ss
@@ -1,6 +1,8 @@
 
 (load-relative "loadtest.ss")
 
+(define shorter? #t)
+
 ; These message boxes mustn't survive
 (let ([c (make-custodian)])
   (parameterize ([current-custodian c])
@@ -1027,10 +1029,11 @@
 	(unless (eq? show? 'dialog)
 	  (go)))))
   (panel-test #f #t)
-  (panel-test vertical-pane% #f)
-  (panel-test horizontal-pane% #f)
-  (panel-test vertical-panel% #t)
-  (panel-test horizontal-panel% #t))
+  (unless shorter?
+    (panel-test vertical-pane% #f)
+    (panel-test horizontal-pane% #f)
+    (panel-test vertical-panel% #t)
+    (panel-test horizontal-panel% #t)))
 
 (panel-tests dialog% #f)
 (panel-tests frame% #t)