diff --git a/collects/tests/html/test.ss b/collects/tests/html/test.ss
index e06d077c7f..3cd24b9699 100644
--- a/collects/tests/html/test.ss
+++ b/collects/tests/html/test.ss
@@ -1,6 +1,6 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
-         (planet schematics/schemeunit:3/text-ui)
+(require schemeunit
+         schemeunit/text-ui
          net/url
          (prefix-in h: html)
          (prefix-in x: xml))
diff --git a/collects/tests/web-server/all-web-server-tests.ss b/collects/tests/web-server/all-web-server-tests.ss
index cf9a6b28a7..809b7e1b0c 100644
--- a/collects/tests/web-server/all-web-server-tests.ss
+++ b/collects/tests/web-server/all-web-server-tests.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          "configuration/all-configuration-tests.ss"
          "dispatchers/all-dispatchers-tests.ss"           
          "lang/all-lang-tests.ss"
diff --git a/collects/tests/web-server/configuration/all-configuration-tests.ss b/collects/tests/web-server/configuration/all-configuration-tests.ss
index 3de7a213ba..eace36452a 100644
--- a/collects/tests/web-server/configuration/all-configuration-tests.ss
+++ b/collects/tests/web-server/configuration/all-configuration-tests.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          "configuration-table-test.ss")
 (provide all-configuration-tests)
 
diff --git a/collects/tests/web-server/configuration/configuration-table-test.ss b/collects/tests/web-server/configuration/configuration-table-test.ss
index 6018612f07..46e8b4b741 100644
--- a/collects/tests/web-server/configuration/configuration-table-test.ss
+++ b/collects/tests/web-server/configuration/configuration-table-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          (only-in mzlib/file
                   make-temporary-file)
          web-server/configuration/configuration-table)
diff --git a/collects/tests/web-server/dispatch-test.ss b/collects/tests/web-server/dispatch-test.ss
index aa5224847e..3bbafc89c2 100644
--- a/collects/tests/web-server/dispatch-test.ss
+++ b/collects/tests/web-server/dispatch-test.ss
@@ -1,5 +1,5 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/http
          web-server/dispatchers/dispatch
          net/url
diff --git a/collects/tests/web-server/dispatchers/all-dispatchers-tests.ss b/collects/tests/web-server/dispatchers/all-dispatchers-tests.ss
index 6d3e761478..c9ab8ab6c0 100644
--- a/collects/tests/web-server/dispatchers/all-dispatchers-tests.ss
+++ b/collects/tests/web-server/dispatchers/all-dispatchers-tests.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          "dispatch-passwords-test.ss"
          "dispatch-files-test.ss"        
          "dispatch-servlets-test.ss"
diff --git a/collects/tests/web-server/dispatchers/dispatch-files-test.ss b/collects/tests/web-server/dispatchers/dispatch-files-test.ss
index d1c825d2a7..92706a6882 100644
--- a/collects/tests/web-server/dispatchers/dispatch-files-test.ss
+++ b/collects/tests/web-server/dispatchers/dispatch-files-test.ss
@@ -1,5 +1,5 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          (only-in mzlib/file
                   file-name-from-path
                   make-temporary-file)
diff --git a/collects/tests/web-server/dispatchers/dispatch-host-test.ss b/collects/tests/web-server/dispatchers/dispatch-host-test.ss
index 1ec05a0d04..aa35529908 100644
--- a/collects/tests/web-server/dispatchers/dispatch-host-test.ss
+++ b/collects/tests/web-server/dispatchers/dispatch-host-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          (only-in mzlib/file
                   make-temporary-file)
          net/url
diff --git a/collects/tests/web-server/dispatchers/dispatch-lang-test.ss b/collects/tests/web-server/dispatchers/dispatch-lang-test.ss
index f80795a9cc..0796cea256 100644
--- a/collects/tests/web-server/dispatchers/dispatch-lang-test.ss
+++ b/collects/tests/web-server/dispatchers/dispatch-lang-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          (planet "sxml.ss" ("lizorkin" "sxml.plt" 2 0))
          mzlib/etc
          mzlib/list
diff --git a/collects/tests/web-server/dispatchers/dispatch-passwords-test.ss b/collects/tests/web-server/dispatchers/dispatch-passwords-test.ss
index 5f0325ee08..b55fcb0b39 100644
--- a/collects/tests/web-server/dispatchers/dispatch-passwords-test.ss
+++ b/collects/tests/web-server/dispatchers/dispatch-passwords-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          (only-in mzlib/file
                   make-temporary-file)
          net/url
diff --git a/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss b/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss
index 2d572d5f53..cecef1c85e 100644
--- a/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss
+++ b/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          (planet "sxml.ss" ("lizorkin" "sxml.plt" 2 0))
          mzlib/etc
          mzlib/list
diff --git a/collects/tests/web-server/dispatchers/filesystem-map-test.ss b/collects/tests/web-server/dispatchers/filesystem-map-test.ss
index 9059091c6b..b42ce23f29 100644
--- a/collects/tests/web-server/dispatchers/filesystem-map-test.ss
+++ b/collects/tests/web-server/dispatchers/filesystem-map-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          net/url
          web-server/private/util
          web-server/dispatchers/filesystem-map)
diff --git a/collects/tests/web-server/dispatchers/servlet-test-util.ss b/collects/tests/web-server/dispatchers/servlet-test-util.ss
index 225e95310b..420c0bcba4 100644
--- a/collects/tests/web-server/dispatchers/servlet-test-util.ss
+++ b/collects/tests/web-server/dispatchers/servlet-test-util.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          (planet "sxml.ss" ("lizorkin" "sxml.plt" 2 0))         
          mzlib/list
          web-server/http
diff --git a/collects/tests/web-server/formlets-test.ss b/collects/tests/web-server/formlets-test.ss
index c466f4a7ab..cd334d69da 100644
--- a/collects/tests/web-server/formlets-test.ss
+++ b/collects/tests/web-server/formlets-test.ss
@@ -1,5 +1,5 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          net/url
          web-server/http
          web-server/formlets
diff --git a/collects/tests/web-server/http/all-http-tests.ss b/collects/tests/web-server/http/all-http-tests.ss
index d4b0a037b8..cc1786846d 100644
--- a/collects/tests/web-server/http/all-http-tests.ss
+++ b/collects/tests/web-server/http/all-http-tests.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          "cookies-test.ss"
          "digest-auth-test.ss")
 (provide all-http-tests)
diff --git a/collects/tests/web-server/http/cookies-test.ss b/collects/tests/web-server/http/cookies-test.ss
index 10d3831fb4..f3b4bac32a 100644
--- a/collects/tests/web-server/http/cookies-test.ss
+++ b/collects/tests/web-server/http/cookies-test.ss
@@ -1,5 +1,5 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          net/url
          web-server/http/request-structs
          web-server/http/response-structs
diff --git a/collects/tests/web-server/http/digest-auth-test.ss b/collects/tests/web-server/http/digest-auth-test.ss
index 1da759b525..bf712d27ad 100644
--- a/collects/tests/web-server/http/digest-auth-test.ss
+++ b/collects/tests/web-server/http/digest-auth-test.ss
@@ -1,5 +1,5 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/http
          net/url)
 (provide digest-auth-tests)
diff --git a/collects/tests/web-server/lang-test.ss b/collects/tests/web-server/lang-test.ss
index dc41b4f683..2e5643630f 100644
--- a/collects/tests/web-server/lang-test.ss
+++ b/collects/tests/web-server/lang-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          "util.ss")
 (provide lang-tests)
 
diff --git a/collects/tests/web-server/lang/abort-resume-test.ss b/collects/tests/web-server/lang/abort-resume-test.ss
index c9d1c320ec..f73366ee4f 100644
--- a/collects/tests/web-server/lang/abort-resume-test.ss
+++ b/collects/tests/web-server/lang/abort-resume-test.ss
@@ -1,5 +1,5 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/lang/abort-resume)
 (require/expose web-server/lang/abort-resume (web-prompt))
 (provide abort-resume-tests)
diff --git a/collects/tests/web-server/lang/all-lang-tests.ss b/collects/tests/web-server/lang/all-lang-tests.ss
index 2f7af74d49..f624fa370d 100644
--- a/collects/tests/web-server/lang/all-lang-tests.ss
+++ b/collects/tests/web-server/lang/all-lang-tests.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          "abort-resume-test.ss"
          "anormal-test.ss"
          "defun-test.ss"
diff --git a/collects/tests/web-server/lang/anormal-test.ss b/collects/tests/web-server/lang/anormal-test.ss
index 8651ffe3b6..b9ddaeac0a 100644
--- a/collects/tests/web-server/lang/anormal-test.ss
+++ b/collects/tests/web-server/lang/anormal-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/lang/anormal
          web-server/lang/util)
 (provide anormal-tests)
diff --git a/collects/tests/web-server/lang/defun-test.ss b/collects/tests/web-server/lang/defun-test.ss
index 7b1e17b954..895d0fa62f 100644
--- a/collects/tests/web-server/lang/defun-test.ss
+++ b/collects/tests/web-server/lang/defun-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/lang/defun
          web-server/lang/util)
 (provide defun-tests)
diff --git a/collects/tests/web-server/lang/file-box-test.ss b/collects/tests/web-server/lang/file-box-test.ss
index fefb26b73c..43c66049ce 100644
--- a/collects/tests/web-server/lang/file-box-test.ss
+++ b/collects/tests/web-server/lang/file-box-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/lang/file-box
          (only-in mzlib/file make-temporary-file))
 (provide file-box-tests)
diff --git a/collects/tests/web-server/lang/labels-test.ss b/collects/tests/web-server/lang/labels-test.ss
index f261c55ef8..7597000385 100644
--- a/collects/tests/web-server/lang/labels-test.ss
+++ b/collects/tests/web-server/lang/labels-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/lang/labels)
 (provide labels-tests)
 
diff --git a/collects/tests/web-server/lang/stuff-url-test.ss b/collects/tests/web-server/lang/stuff-url-test.ss
index 70521c87d9..0dc672a5e1 100644
--- a/collects/tests/web-server/lang/stuff-url-test.ss
+++ b/collects/tests/web-server/lang/stuff-url-test.ss
@@ -1,7 +1,7 @@
 #lang scheme/base
 (require web-server/lang/stuff-url
          web-server/stuffers
-         (planet schematics/schemeunit:3)
+         schemeunit
          net/url
          mzlib/serialize
          "../util.ss")
diff --git a/collects/tests/web-server/lang/web-param-test.ss b/collects/tests/web-server/lang/web-param-test.ss
index 19fc9646dc..e9213726ee 100644
--- a/collects/tests/web-server/lang/web-param-test.ss
+++ b/collects/tests/web-server/lang/web-param-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          "../util.ss")
 (provide web-param-tests)
 
diff --git a/collects/tests/web-server/managers/all-managers-tests.ss b/collects/tests/web-server/managers/all-managers-tests.ss
index b2b0b2542c..36223c8e97 100644
--- a/collects/tests/web-server/managers/all-managers-tests.ss
+++ b/collects/tests/web-server/managers/all-managers-tests.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3))
+(require schemeunit)
 (provide all-managers-tests)
 
 (define all-managers-tests
diff --git a/collects/tests/web-server/private/all-private-tests.ss b/collects/tests/web-server/private/all-private-tests.ss
index 6646557df1..3755a1510e 100644
--- a/collects/tests/web-server/private/all-private-tests.ss
+++ b/collects/tests/web-server/private/all-private-tests.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          "request-test.ss"
          "cache-table-test.ss"
          "response-test.ss"
diff --git a/collects/tests/web-server/private/cache-table-test.ss b/collects/tests/web-server/private/cache-table-test.ss
index 5a9dafb68e..2cd62b14ef 100644
--- a/collects/tests/web-server/private/cache-table-test.ss
+++ b/collects/tests/web-server/private/cache-table-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/private/cache-table)
 (provide cache-table-tests)
 
diff --git a/collects/tests/web-server/private/connection-manager-test.ss b/collects/tests/web-server/private/connection-manager-test.ss
index 5e6a458dfa..84a4475a31 100644
--- a/collects/tests/web-server/private/connection-manager-test.ss
+++ b/collects/tests/web-server/private/connection-manager-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/private/connection-manager)
 (provide connection-manager-tests)
 
diff --git a/collects/tests/web-server/private/define-closure-test.ss b/collects/tests/web-server/private/define-closure-test.ss
index 5bb26814f1..8adc374e02 100644
--- a/collects/tests/web-server/private/define-closure-test.ss
+++ b/collects/tests/web-server/private/define-closure-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          mzlib/serialize
          mzlib/match
          web-server/private/define-closure)
diff --git a/collects/tests/web-server/private/gzip-test.ss b/collects/tests/web-server/private/gzip-test.ss
index c1969af515..e3b2c74dc7 100644
--- a/collects/tests/web-server/private/gzip-test.ss
+++ b/collects/tests/web-server/private/gzip-test.ss
@@ -1,5 +1,5 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/private/gzip)
 (provide gzip-tests)
 
diff --git a/collects/tests/web-server/private/mime-types-test.ss b/collects/tests/web-server/private/mime-types-test.ss
index 85c6c64cc3..84ad15275d 100644
--- a/collects/tests/web-server/private/mime-types-test.ss
+++ b/collects/tests/web-server/private/mime-types-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          (only-in mzlib/file make-temporary-file)
          web-server/http
          web-server/private/mime-types)
diff --git a/collects/tests/web-server/private/mod-map-test.ss b/collects/tests/web-server/private/mod-map-test.ss
index d4c45dc127..b5906a16e7 100644
--- a/collects/tests/web-server/private/mod-map-test.ss
+++ b/collects/tests/web-server/private/mod-map-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/private/mod-map
          mzlib/serialize
          "../util.ss")
diff --git a/collects/tests/web-server/private/request-test.ss b/collects/tests/web-server/private/request-test.ss
index 13f325a3f4..2718af0a62 100644
--- a/collects/tests/web-server/private/request-test.ss
+++ b/collects/tests/web-server/private/request-test.ss
@@ -1,5 +1,5 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/private/connection-manager
          web-server/private/timer
          web-server/http/request
diff --git a/collects/tests/web-server/private/response-test.ss b/collects/tests/web-server/private/response-test.ss
index b5305ca7a5..a9aef61232 100644
--- a/collects/tests/web-server/private/response-test.ss
+++ b/collects/tests/web-server/private/response-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          xml/xml
          (only-in mzlib/file
                   make-temporary-file)
diff --git a/collects/tests/web-server/private/session-test.ss b/collects/tests/web-server/private/session-test.ss
index 2d8882d494..46fe58b581 100644
--- a/collects/tests/web-server/private/session-test.ss
+++ b/collects/tests/web-server/private/session-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          mzlib/list
          net/url
          web-server/private/session)
diff --git a/collects/tests/web-server/private/url-param-test.ss b/collects/tests/web-server/private/url-param-test.ss
index 3c134259f0..4b1e112813 100644
--- a/collects/tests/web-server/private/url-param-test.ss
+++ b/collects/tests/web-server/private/url-param-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          net/url
          web-server/private/url-param)
 (provide url-param-tests)
diff --git a/collects/tests/web-server/private/util-test.ss b/collects/tests/web-server/private/util-test.ss
index bd28d4a886..a6389e35ca 100644
--- a/collects/tests/web-server/private/util-test.ss
+++ b/collects/tests/web-server/private/util-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          net/url
          xml/xml
          mzlib/contract
diff --git a/collects/tests/web-server/run-all-tests.ss b/collects/tests/web-server/run-all-tests.ss
index 9aa2ce4abf..e07f5a7382 100644
--- a/collects/tests/web-server/run-all-tests.ss
+++ b/collects/tests/web-server/run-all-tests.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3/text-ui)
+(require schemeunit/text-ui
          "all-web-server-tests.ss")
 
 (run-tests all-web-server-tests)
diff --git a/collects/tests/web-server/servlet-env-test.ss b/collects/tests/web-server/servlet-env-test.ss
index cd3766f31a..72193dcfa2 100644
--- a/collects/tests/web-server/servlet-env-test.ss
+++ b/collects/tests/web-server/servlet-env-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          #;(only (planet "ssax.ss" ("lizorkin" "ssax.plt" 1 3))
                  ssax:xml->sxml)
          #;(planet "sxml.ss" ("lizorkin" "sxml.plt" 1 4))
diff --git a/collects/tests/web-server/servlet/all-servlet-tests.ss b/collects/tests/web-server/servlet/all-servlet-tests.ss
index 898aa16ad8..d84885069f 100644
--- a/collects/tests/web-server/servlet/all-servlet-tests.ss
+++ b/collects/tests/web-server/servlet/all-servlet-tests.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          "bindings-test.ss"
          "basic-auth-test.ss"
          "helpers-test.ss"
diff --git a/collects/tests/web-server/servlet/basic-auth-test.ss b/collects/tests/web-server/servlet/basic-auth-test.ss
index 33f3eedf68..4ac9f26fde 100644
--- a/collects/tests/web-server/servlet/basic-auth-test.ss
+++ b/collects/tests/web-server/servlet/basic-auth-test.ss
@@ -1,5 +1,5 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/http
          net/url)
 (provide basic-auth-tests)
diff --git a/collects/tests/web-server/servlet/bindings-test.ss b/collects/tests/web-server/servlet/bindings-test.ss
index 343e6f10f1..b7ef52dab3 100644
--- a/collects/tests/web-server/servlet/bindings-test.ss
+++ b/collects/tests/web-server/servlet/bindings-test.ss
@@ -1,5 +1,5 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          mzlib/list
          net/url
          web-server/http
diff --git a/collects/tests/web-server/servlet/helpers-test.ss b/collects/tests/web-server/servlet/helpers-test.ss
index 9c7c2d6a9a..e68596f61a 100644
--- a/collects/tests/web-server/servlet/helpers-test.ss
+++ b/collects/tests/web-server/servlet/helpers-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/servlet)
 (provide helpers-tests)
 
diff --git a/collects/tests/web-server/servlet/web-test.ss b/collects/tests/web-server/servlet/web-test.ss
index 8caee36c94..b42f637086 100644
--- a/collects/tests/web-server/servlet/web-test.ss
+++ b/collects/tests/web-server/servlet/web-test.ss
@@ -1,5 +1,5 @@
 #lang scheme/base
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          net/url
          web-server/servlet/web)
 (require/expose web-server/servlet/web
diff --git a/collects/tests/web-server/stuffers-test.ss b/collects/tests/web-server/stuffers-test.ss
index 3634bc1f6c..2f4e555e1b 100644
--- a/collects/tests/web-server/stuffers-test.ss
+++ b/collects/tests/web-server/stuffers-test.ss
@@ -1,5 +1,5 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
+(require schemeunit
          web-server/stuffers
          web-server/private/servlet
          web-server/http
diff --git a/collects/tests/xml/test-clark.ss b/collects/tests/xml/test-clark.ss
index 100f42b9f9..9375215f3b 100644
--- a/collects/tests/xml/test-clark.ss
+++ b/collects/tests/xml/test-clark.ss
@@ -1,12 +1,14 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
-         (planet schematics/schemeunit:3/base)
-         (planet schematics/schemeunit:3/test-case)
-         (planet schematics/schemeunit:3/check)
-         (planet schematics/schemeunit:3/test-suite)
-         (planet schematics/schemeunit:3/text-ui)
+(require schemeunit
+         schemeunit/base
+         schemeunit/test-case
+         schemeunit/check
+         schemeunit/test-suite
+         schemeunit/text-ui
          xml
          scheme/runtime-path)
+(require/expose schemeunit/test-suite
+                (current-seed))
 
 (define (validate-xml? xml)
   (error 'validate-xml? "Not implemented"))
@@ -19,15 +21,21 @@
 (define (dir->test-suite d name path->test-case)
   (make-schemeunit-test-suite
    name
-   (parameterize
-       ([current-test-case-around test-suite-test-case-around]
-        [current-check-around test-suite-check-around])     
-     (map (lambda (p)
-            (path->test-case (build-path d p)))
-          (filter (lambda (p)
-                    (define ext (filename-extension p))
-                    (and ext (bytes=? #"xml" ext)))
-                  (directory-list d))))
+   (lambda (fdown fup fhere seed)
+     (parameterize
+         ([current-seed seed]
+          [current-test-case-around (test-suite-test-case-around fhere)]
+          [current-check-around (test-suite-check-around fhere)])
+       (for-each (lambda (p)
+                   (define t (path->test-case (build-path d p)))
+                   (if (schemeunit-test-suite? t)
+                       (current-seed (apply-test-suite t fdown fup fhere (current-seed)))
+                       t))
+                 (filter (lambda (p)
+                           (define ext (filename-extension p))
+                           (and ext (bytes=? #"xml" ext)))
+                         (directory-list d)))) 
+     (current-seed))
    void
    void))
 
@@ -58,7 +66,7 @@
 (define (valid-dir->test-suite d)
   (define (path->test-case f)
     (test-not-false (path->string f)
-                      (validate-xml? (read-xml/file f))))
+                    (validate-xml? (read-xml/file f))))
   (test-suite
    "Valid"
    (dir->test-suite 
diff --git a/collects/tests/xml/test.ss b/collects/tests/xml/test.ss
index 0da31f526c..0da08856ff 100644
--- a/collects/tests/xml/test.ss
+++ b/collects/tests/xml/test.ss
@@ -1,6 +1,6 @@
 #lang scheme
-(require (planet schematics/schemeunit:3)
-         (planet schematics/schemeunit:3/text-ui)
+(require schemeunit
+         schemeunit/text-ui
          xml
          xml/plist
          mzlib/etc