diff --git a/collects/web-server/tests/all-web-server-tests.ss b/collects/tests/web-server/all-web-server-tests.ss
similarity index 100%
rename from collects/web-server/tests/all-web-server-tests.ss
rename to collects/tests/web-server/all-web-server-tests.ss
diff --git a/collects/web-server/tests/configuration/all-configuration-tests.ss b/collects/tests/web-server/configuration/all-configuration-tests.ss
similarity index 100%
rename from collects/web-server/tests/configuration/all-configuration-tests.ss
rename to collects/tests/web-server/configuration/all-configuration-tests.ss
diff --git a/collects/web-server/tests/configuration/configuration-table-test.ss b/collects/tests/web-server/configuration/configuration-table-test.ss
similarity index 100%
rename from collects/web-server/tests/configuration/configuration-table-test.ss
rename to collects/tests/web-server/configuration/configuration-table-test.ss
diff --git a/collects/web-server/tests/dispatchers/all-dispatchers-tests.ss b/collects/tests/web-server/dispatchers/all-dispatchers-tests.ss
similarity index 100%
rename from collects/web-server/tests/dispatchers/all-dispatchers-tests.ss
rename to collects/tests/web-server/dispatchers/all-dispatchers-tests.ss
diff --git a/collects/web-server/tests/dispatchers/dispatch-files-test.ss b/collects/tests/web-server/dispatchers/dispatch-files-test.ss
similarity index 100%
rename from collects/web-server/tests/dispatchers/dispatch-files-test.ss
rename to collects/tests/web-server/dispatchers/dispatch-files-test.ss
diff --git a/collects/web-server/tests/dispatchers/dispatch-host-test.ss b/collects/tests/web-server/dispatchers/dispatch-host-test.ss
similarity index 100%
rename from collects/web-server/tests/dispatchers/dispatch-host-test.ss
rename to collects/tests/web-server/dispatchers/dispatch-host-test.ss
diff --git a/collects/web-server/tests/dispatchers/dispatch-lang-test.ss b/collects/tests/web-server/dispatchers/dispatch-lang-test.ss
similarity index 100%
rename from collects/web-server/tests/dispatchers/dispatch-lang-test.ss
rename to collects/tests/web-server/dispatchers/dispatch-lang-test.ss
diff --git a/collects/web-server/tests/dispatchers/dispatch-passwords-test.ss b/collects/tests/web-server/dispatchers/dispatch-passwords-test.ss
similarity index 100%
rename from collects/web-server/tests/dispatchers/dispatch-passwords-test.ss
rename to collects/tests/web-server/dispatchers/dispatch-passwords-test.ss
diff --git a/collects/web-server/tests/dispatchers/dispatch-servlets-test.ss b/collects/tests/web-server/dispatchers/dispatch-servlets-test.ss
similarity index 100%
rename from collects/web-server/tests/dispatchers/dispatch-servlets-test.ss
rename to collects/tests/web-server/dispatchers/dispatch-servlets-test.ss
diff --git a/collects/web-server/tests/dispatchers/filesystem-map-test.ss b/collects/tests/web-server/dispatchers/filesystem-map-test.ss
similarity index 100%
rename from collects/web-server/tests/dispatchers/filesystem-map-test.ss
rename to collects/tests/web-server/dispatchers/filesystem-map-test.ss
diff --git a/collects/web-server/tests/info.ss b/collects/tests/web-server/info.ss
similarity index 100%
rename from collects/web-server/tests/info.ss
rename to collects/tests/web-server/info.ss
diff --git a/collects/web-server/tests/lang-test.ss b/collects/tests/web-server/lang-test.ss
similarity index 100%
rename from collects/web-server/tests/lang-test.ss
rename to collects/tests/web-server/lang-test.ss
diff --git a/collects/web-server/tests/lang/abort-resume-test.ss b/collects/tests/web-server/lang/abort-resume-test.ss
similarity index 100%
rename from collects/web-server/tests/lang/abort-resume-test.ss
rename to collects/tests/web-server/lang/abort-resume-test.ss
diff --git a/collects/web-server/tests/lang/all-lang-tests.ss b/collects/tests/web-server/lang/all-lang-tests.ss
similarity index 100%
rename from collects/web-server/tests/lang/all-lang-tests.ss
rename to collects/tests/web-server/lang/all-lang-tests.ss
diff --git a/collects/web-server/tests/lang/anormal-test.ss b/collects/tests/web-server/lang/anormal-test.ss
similarity index 100%
rename from collects/web-server/tests/lang/anormal-test.ss
rename to collects/tests/web-server/lang/anormal-test.ss
diff --git a/collects/web-server/tests/lang/defun-test.ss b/collects/tests/web-server/lang/defun-test.ss
similarity index 100%
rename from collects/web-server/tests/lang/defun-test.ss
rename to collects/tests/web-server/lang/defun-test.ss
diff --git a/collects/web-server/tests/lang/file-box-test.ss b/collects/tests/web-server/lang/file-box-test.ss
similarity index 100%
rename from collects/web-server/tests/lang/file-box-test.ss
rename to collects/tests/web-server/lang/file-box-test.ss
diff --git a/collects/web-server/tests/lang/labels-test.ss b/collects/tests/web-server/lang/labels-test.ss
similarity index 100%
rename from collects/web-server/tests/lang/labels-test.ss
rename to collects/tests/web-server/lang/labels-test.ss
diff --git a/collects/web-server/tests/lang/stuff-url-test.ss b/collects/tests/web-server/lang/stuff-url-test.ss
similarity index 100%
rename from collects/web-server/tests/lang/stuff-url-test.ss
rename to collects/tests/web-server/lang/stuff-url-test.ss
diff --git a/collects/web-server/tests/lang/web-param-test.ss b/collects/tests/web-server/lang/web-param-test.ss
similarity index 100%
rename from collects/web-server/tests/lang/web-param-test.ss
rename to collects/tests/web-server/lang/web-param-test.ss
diff --git a/collects/web-server/tests/managers/all-managers-tests.ss b/collects/tests/web-server/managers/all-managers-tests.ss
similarity index 100%
rename from collects/web-server/tests/managers/all-managers-tests.ss
rename to collects/tests/web-server/managers/all-managers-tests.ss
diff --git a/collects/web-server/tests/private/all-private-tests.ss b/collects/tests/web-server/private/all-private-tests.ss
similarity index 100%
rename from collects/web-server/tests/private/all-private-tests.ss
rename to collects/tests/web-server/private/all-private-tests.ss
diff --git a/collects/web-server/tests/private/cache-table-test.ss b/collects/tests/web-server/private/cache-table-test.ss
similarity index 100%
rename from collects/web-server/tests/private/cache-table-test.ss
rename to collects/tests/web-server/private/cache-table-test.ss
diff --git a/collects/web-server/tests/private/connection-manager-test.ss b/collects/tests/web-server/private/connection-manager-test.ss
similarity index 100%
rename from collects/web-server/tests/private/connection-manager-test.ss
rename to collects/tests/web-server/private/connection-manager-test.ss
diff --git a/collects/web-server/tests/private/define-closure-test.ss b/collects/tests/web-server/private/define-closure-test.ss
similarity index 100%
rename from collects/web-server/tests/private/define-closure-test.ss
rename to collects/tests/web-server/private/define-closure-test.ss
diff --git a/collects/web-server/tests/private/mime-types-test.ss b/collects/tests/web-server/private/mime-types-test.ss
similarity index 100%
rename from collects/web-server/tests/private/mime-types-test.ss
rename to collects/tests/web-server/private/mime-types-test.ss
diff --git a/collects/web-server/tests/private/mod-map-test.ss b/collects/tests/web-server/private/mod-map-test.ss
similarity index 100%
rename from collects/web-server/tests/private/mod-map-test.ss
rename to collects/tests/web-server/private/mod-map-test.ss
diff --git a/collects/web-server/tests/private/request-test.ss b/collects/tests/web-server/private/request-test.ss
similarity index 100%
rename from collects/web-server/tests/private/request-test.ss
rename to collects/tests/web-server/private/request-test.ss
diff --git a/collects/web-server/tests/private/response-test.ss b/collects/tests/web-server/private/response-test.ss
similarity index 100%
rename from collects/web-server/tests/private/response-test.ss
rename to collects/tests/web-server/private/response-test.ss
diff --git a/collects/web-server/tests/private/session-test.ss b/collects/tests/web-server/private/session-test.ss
similarity index 100%
rename from collects/web-server/tests/private/session-test.ss
rename to collects/tests/web-server/private/session-test.ss
diff --git a/collects/web-server/tests/private/url-param-test.ss b/collects/tests/web-server/private/url-param-test.ss
similarity index 100%
rename from collects/web-server/tests/private/url-param-test.ss
rename to collects/tests/web-server/private/url-param-test.ss
diff --git a/collects/web-server/tests/private/util-test.ss b/collects/tests/web-server/private/util-test.ss
similarity index 100%
rename from collects/web-server/tests/private/util-test.ss
rename to collects/tests/web-server/private/util-test.ss
diff --git a/collects/web-server/tests/run b/collects/tests/web-server/run
similarity index 100%
rename from collects/web-server/tests/run
rename to collects/tests/web-server/run
diff --git a/collects/web-server/tests/run-all-tests.ss b/collects/tests/web-server/run-all-tests.ss
similarity index 100%
rename from collects/web-server/tests/run-all-tests.ss
rename to collects/tests/web-server/run-all-tests.ss
diff --git a/collects/web-server/tests/servlet-env-test.ss b/collects/tests/web-server/servlet-env-test.ss
similarity index 100%
rename from collects/web-server/tests/servlet-env-test.ss
rename to collects/tests/web-server/servlet-env-test.ss
diff --git a/collects/web-server/tests/servlet/all-servlet-tests.ss b/collects/tests/web-server/servlet/all-servlet-tests.ss
similarity index 100%
rename from collects/web-server/tests/servlet/all-servlet-tests.ss
rename to collects/tests/web-server/servlet/all-servlet-tests.ss
diff --git a/collects/web-server/tests/servlet/basic-auth-test.ss b/collects/tests/web-server/servlet/basic-auth-test.ss
similarity index 100%
rename from collects/web-server/tests/servlet/basic-auth-test.ss
rename to collects/tests/web-server/servlet/basic-auth-test.ss
diff --git a/collects/web-server/tests/servlet/bindings-test.ss b/collects/tests/web-server/servlet/bindings-test.ss
similarity index 100%
rename from collects/web-server/tests/servlet/bindings-test.ss
rename to collects/tests/web-server/servlet/bindings-test.ss
diff --git a/collects/web-server/tests/servlet/helpers-test.ss b/collects/tests/web-server/servlet/helpers-test.ss
similarity index 100%
rename from collects/web-server/tests/servlet/helpers-test.ss
rename to collects/tests/web-server/servlet/helpers-test.ss
diff --git a/collects/web-server/tests/servlet/servlet-url-test.ss b/collects/tests/web-server/servlet/servlet-url-test.ss
similarity index 100%
rename from collects/web-server/tests/servlet/servlet-url-test.ss
rename to collects/tests/web-server/servlet/servlet-url-test.ss
diff --git a/collects/web-server/tests/servlet/web-test.ss b/collects/tests/web-server/servlet/web-test.ss
similarity index 100%
rename from collects/web-server/tests/servlet/web-test.ss
rename to collects/tests/web-server/servlet/web-test.ss
diff --git a/collects/web-server/tests/util.ss b/collects/tests/web-server/util.ss
similarity index 100%
rename from collects/web-server/tests/util.ss
rename to collects/tests/web-server/util.ss