diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/bad-xexpr.ss b/collects/web-server/default-web-root/servlets/tests/bad-xexpr.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/bad-xexpr.ss
rename to collects/web-server/default-web-root/servlets/tests/bad-xexpr.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/bus-error.ss b/collects/web-server/default-web-root/servlets/tests/bus-error.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/bus-error.ss
rename to collects/web-server/default-web-root/servlets/tests/bus-error.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/button.ss b/collects/web-server/default-web-root/servlets/tests/button.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/button.ss
rename to collects/web-server/default-web-root/servlets/tests/button.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/counter-cells.ss b/collects/web-server/default-web-root/servlets/tests/counter-cells.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/counter-cells.ss
rename to collects/web-server/default-web-root/servlets/tests/counter-cells.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/counter-cps.ss b/collects/web-server/default-web-root/servlets/tests/counter-cps.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/counter-cps.ss
rename to collects/web-server/default-web-root/servlets/tests/counter-cps.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/counter.ss b/collects/web-server/default-web-root/servlets/tests/counter.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/counter.ss
rename to collects/web-server/default-web-root/servlets/tests/counter.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/cust.ss b/collects/web-server/default-web-root/servlets/tests/cust.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/cust.ss
rename to collects/web-server/default-web-root/servlets/tests/cust.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/expiration.ss b/collects/web-server/default-web-root/servlets/tests/expiration.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/expiration.ss
rename to collects/web-server/default-web-root/servlets/tests/expiration.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/fault.ss b/collects/web-server/default-web-root/servlets/tests/fault.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/fault.ss
rename to collects/web-server/default-web-root/servlets/tests/fault.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/form.ss b/collects/web-server/default-web-root/servlets/tests/form.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/form.ss
rename to collects/web-server/default-web-root/servlets/tests/form.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/fupload.ss b/collects/web-server/default-web-root/servlets/tests/fupload.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/fupload.ss
rename to collects/web-server/default-web-root/servlets/tests/fupload.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/hang.ss b/collects/web-server/default-web-root/servlets/tests/hang.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/hang.ss
rename to collects/web-server/default-web-root/servlets/tests/hang.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/hod-0618.ss b/collects/web-server/default-web-root/servlets/tests/hod-0618.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/hod-0618.ss
rename to collects/web-server/default-web-root/servlets/tests/hod-0618.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/inf-essence.ss b/collects/web-server/default-web-root/servlets/tests/inf-essence.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/inf-essence.ss
rename to collects/web-server/default-web-root/servlets/tests/inf-essence.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/inf.ss b/collects/web-server/default-web-root/servlets/tests/inf.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/inf.ss
rename to collects/web-server/default-web-root/servlets/tests/inf.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/instance-expiration-2.ss b/collects/web-server/default-web-root/servlets/tests/instance-expiration-2.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/instance-expiration-2.ss
rename to collects/web-server/default-web-root/servlets/tests/instance-expiration-2.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/instance-expiration.ss b/collects/web-server/default-web-root/servlets/tests/instance-expiration.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/instance-expiration.ss
rename to collects/web-server/default-web-root/servlets/tests/instance-expiration.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/jas01-param.ss b/collects/web-server/default-web-root/servlets/tests/jas01-param.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/jas01-param.ss
rename to collects/web-server/default-web-root/servlets/tests/jas01-param.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/jas01-test.ss b/collects/web-server/default-web-root/servlets/tests/jas01-test.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/jas01-test.ss
rename to collects/web-server/default-web-root/servlets/tests/jas01-test.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/lock.ss b/collects/web-server/default-web-root/servlets/tests/lock.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/lock.ss
rename to collects/web-server/default-web-root/servlets/tests/lock.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/none-test.ss b/collects/web-server/default-web-root/servlets/tests/none-test.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/none-test.ss
rename to collects/web-server/default-web-root/servlets/tests/none-test.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/plus.ss b/collects/web-server/default-web-root/servlets/tests/plus.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/plus.ss
rename to collects/web-server/default-web-root/servlets/tests/plus.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/pr5490.ss b/collects/web-server/default-web-root/servlets/tests/pr5490.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/pr5490.ss
rename to collects/web-server/default-web-root/servlets/tests/pr5490.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/pr7359.ss b/collects/web-server/default-web-root/servlets/tests/pr7359.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/pr7359.ss
rename to collects/web-server/default-web-root/servlets/tests/pr7359.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/pr7533.ss b/collects/web-server/default-web-root/servlets/tests/pr7533.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/pr7533.ss
rename to collects/web-server/default-web-root/servlets/tests/pr7533.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/ssd.ss b/collects/web-server/default-web-root/servlets/tests/ssd.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/ssd.ss
rename to collects/web-server/default-web-root/servlets/tests/ssd.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/static.ss b/collects/web-server/default-web-root/servlets/tests/static.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/static.ss
rename to collects/web-server/default-web-root/servlets/tests/static.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/update.ss b/collects/web-server/default-web-root/servlets/tests/update.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/update.ss
rename to collects/web-server/default-web-root/servlets/tests/update.ss
diff --git a/collects/web-server/default-web-root/servlets/tests/new-suite/utf8.ss b/collects/web-server/default-web-root/servlets/tests/utf8.ss
similarity index 100%
rename from collects/web-server/default-web-root/servlets/tests/new-suite/utf8.ss
rename to collects/web-server/default-web-root/servlets/tests/utf8.ss