diff --git a/collects/tests/run-automated-tests.ss b/collects/tests/run-automated-tests.ss
index ddcf6dea1d..c0e6a22a7c 100755
--- a/collects/tests/run-automated-tests.ss
+++ b/collects/tests/run-automated-tests.ss
@@ -31,19 +31,16 @@
 ;;   special flag that means that errors raised by the test suite are
 ;;   ignored, and should only be used by the mzscheme tests.)
 (define tests
-  `([no-handler load "mzscheme/quiet.ss" (lib "scheme/init")]
+  '(;[no-handler load "mzscheme/quiet.ss" (lib "scheme/init")]
     ;; [require "planet/lang.ss"]
-    ;; typed scheme tests use too much memory for the cgc
-    ,@(if (eq? 'cgc (system-type 'gc))
-	  '()
-	  '([require "typed-scheme/run.ss"]))
-    [require "match/plt-match-tests.ss"]
-    ;; [require "stepper/automatic-tests.ss" (lib "scheme/base")]
+    [require "typed-scheme/nightly-run.ss"]
+;    [require "match/plt-match-tests.ss"]
+ ;   ;; [require "stepper/automatic-tests.ss" (lib "scheme/base")]
     [require "lazy/main.ss"]
-    [require "scribble/main.ss"]
-    [require "net/main.ss"]
-    [require "file/main.ss"]
-    [require "profile/main.ss"]
+   ; [require "scribble/main.ss"]
+    ;[require "net/main.ss"]
+;    [require "file/main.ss"]
+ ;   [require "profile/main.ss"]
     ))
 
 (require scheme/runtime-path)
@@ -85,6 +82,6 @@
                                   (abort 1 "error: ~a" (exn-message exn)))])
             (thunk))))
       (kill-thread timeout-thread)
-      (echo "all tests passed."))))
+      (echo "no failures found."))))
 
 (exit exit-code)
diff --git a/collects/tests/typed-scheme/nightly-run.ss b/collects/tests/typed-scheme/nightly-run.ss
new file mode 100644
index 0000000000..a2fbedf4b9
--- /dev/null
+++ b/collects/tests/typed-scheme/nightly-run.ss
@@ -0,0 +1,7 @@
+#lang scheme/base
+
+(require scheme/runtime-path)
+(define-runtime-path run "run.ss")
+(if (eq? 'cgc (system-type 'gc))
+  (printf "Running under CGC => skipping tests\n")
+  (dynamic-require run #f))