diff --git a/collects/tests/match/plt-match-tests.ss b/collects/tests/match/plt-match-tests.ss
index b7e52781d7..9d03c4602b 100644
--- a/collects/tests/match/plt-match-tests.ss
+++ b/collects/tests/match/plt-match-tests.ss
@@ -225,5 +225,8 @@
                                         other-tests 
                                         other-plt-tests
                                         )))
-  (run-tests)
+  (when (getenv "PLT_TESTS")
+    (unless (parameterize ([current-output-port (open-output-string)])
+              (= 0 (run-tests)))
+      (error "Match Tests did not pass.")))
   )
\ No newline at end of file
diff --git a/collects/tests/run-automated-tests.ss b/collects/tests/run-automated-tests.ss
index dcea8551f2..a9bad6ef45 100755
--- a/collects/tests/run-automated-tests.ss
+++ b/collects/tests/run-automated-tests.ss
@@ -29,7 +29,9 @@
 ;;   specifications for things to require into the initial namespace
 ;;   for the test before the test is loaded.
 (define tests
-  '([load "mzscheme/quiet.ss" (lib "scheme/init")]))
+  '([load "mzscheme/quiet.ss" (lib "scheme/init")]
+    [require "typed-scheme/main.ss"]
+    [require "match/plt-match-tests.ss"]))
 
 
 (require scheme/runtime-path (for-syntax scheme/base))