diff --git a/collects/tests/macro-debugger/all-tests.ss b/collects/tests/macro-debugger/all-tests.ss
index a142bf2..9dd0ec8 100644
--- a/collects/tests/macro-debugger/all-tests.ss
+++ b/collects/tests/macro-debugger/all-tests.ss
@@ -1,7 +1,6 @@
-
 #lang scheme/base
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 9))
-         (planet "graphical-ui.ss" ("schematics" "schemeunit.plt" 2 9)))
+(require schemeunit
+         schemeunit/gui)
 (require macro-debugger/model/debug
          "gentest-framework.ss"
          "gentests.ss"
@@ -16,8 +15,8 @@
          "tests/collects.ss")
 (provide go)
 
-(define (go) (test/graphical-ui all-tests))
-(define (collects) (test/graphical-ui big-libs-tests))
+(define (go) (test/gui all-tests))
+(define (collects) (test/gui big-libs-tests))
 
 (define protos
   (list proto:kernel-forms
diff --git a/collects/tests/macro-debugger/gentests.ss b/collects/tests/macro-debugger/gentests.ss
index 2fc2c85..760ba14 100644
--- a/collects/tests/macro-debugger/gentests.ss
+++ b/collects/tests/macro-debugger/gentests.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 9))
-         macro-debugger/model/debug
+(require schemeunit)
+(require macro-debugger/model/debug
          macro-debugger/model/stx-util
          "gentest-framework.ss"
          "test-setup.ss")
@@ -23,9 +23,9 @@
   (mk-test "Hiding: Reductions" checker-for-hidden-steps protos))
 
 (define (mk-test label checker protos)
-  (apply test-suite label
-         (filter values 
-                 (map (mk-gen-test checker) protos))))
+  (make-test-suite label
+                   (filter values 
+                           (map (mk-gen-test checker) protos))))
 
 (define (mk-gen-test f)
   (define (gen prototest)
@@ -33,7 +33,7 @@
       [(struct collection (label contents))
        (let ([tests (filter values (map gen contents))])
          (and (pair? tests)
-              (apply test-suite label tests)))]
+              (make-test-suite label tests)))]
       [(struct individual (label form attrs))
        (f label form attrs)]))
   gen)
diff --git a/collects/tests/macro-debugger/tests/collects.ss b/collects/tests/macro-debugger/tests/collects.ss
index 524b562..9e1c948 100644
--- a/collects/tests/macro-debugger/tests/collects.ss
+++ b/collects/tests/macro-debugger/tests/collects.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 9))
-         (planet "graphical-ui.ss" ("schematics" "schemeunit.plt" 2 9)))
+(require schemeunit
+         schemeunit/gui)
 (require macro-debugger/model/debug
          scheme/path
          scheme/gui)
@@ -47,11 +47,11 @@
 
 (define (test-libs name mods)
   (test-suite name
-    (apply test-suite "Trace & Parse"
+    (apply make-test-suite "Trace & Parse"
            (for/list ([m mods]) (test-lib/deriv m)))
-    (apply test-suite "Reductions"
+    (apply make-test-suite "Reductions"
            (for/list ([m mods]) (test-lib/hide m hide-none-policy)))
-    (apply test-suite "Standard hiding"
+    (apply make-test-suite "Standard hiding"
            (for/list ([m mods]) (test-lib/hide m standard-policy)))))
 
 (define (test-lib/deriv m)
diff --git a/collects/tests/macro-debugger/tests/hiding.ss b/collects/tests/macro-debugger/tests/hiding.ss
index b4de80e..de6d130 100644
--- a/collects/tests/macro-debugger/tests/hiding.ss
+++ b/collects/tests/macro-debugger/tests/hiding.ss
@@ -1,7 +1,6 @@
-
 #lang scheme/base
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 8))
-         macro-debugger/model/debug
+(require schemeunit)
+(require macro-debugger/model/debug
          "../test-setup.ss")
 (provide specialized-hiding-tests)
 
diff --git a/collects/tests/macro-debugger/tests/policy.ss b/collects/tests/macro-debugger/tests/policy.ss
index d0585a3..0069e0a 100644
--- a/collects/tests/macro-debugger/tests/policy.ss
+++ b/collects/tests/macro-debugger/tests/policy.ss
@@ -1,7 +1,6 @@
 #lang scheme/base
-
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 8))
-         macro-debugger/model/debug
+(require schemeunit)
+(require macro-debugger/model/debug
          "../test-setup.ss")
 (provide policy-tests)
 
diff --git a/collects/tests/macro-debugger/tests/regression.ss b/collects/tests/macro-debugger/tests/regression.ss
index dc1e653..8c20839 100644
--- a/collects/tests/macro-debugger/tests/regression.ss
+++ b/collects/tests/macro-debugger/tests/regression.ss
@@ -1,6 +1,6 @@
 #lang scheme/base
-(require (planet "test.ss" ("schematics" "schemeunit.plt" 2 8))
-         macro-debugger/model/debug
+(require schemeunit)
+(require macro-debugger/model/debug
          macro-debugger/model/steps
          "../test-setup.ss")
 (provide regression-tests)