diff --git a/collects/htdp/info.ss b/collects/htdp/info.ss
index d0383f9efa..8dc150611c 100644
--- a/collects/htdp/info.ss
+++ b/collects/htdp/info.ss
@@ -6,4 +6,4 @@
     ;; TEMPORARY DISABLE THESE FILES UNTIL FIXED
     ;; "matrix.ss" "matrix-client.ss" "matrix-invisible.ss"
     ;; "matrix-render-sig.ss" "matrix-sig.ss" "matrix-unit.ss"
-    "Test"))
+    "tests"))
diff --git a/collects/htdp/matrix.txt b/collects/htdp/matrix.txt
index 3509f2f267..1306be5607 100644
--- a/collects/htdp/matrix.txt
+++ b/collects/htdp/matrix.txt
@@ -31,5 +31,5 @@ files:
 
  htdp/matrix-unit.ss 	  : the matrix functionality 
 
- htdp/Tests/matrix-test.ss: a textual test 
- htdp/Tests/matrix-client.ss a test with embedded images 
+ htdp/tests/matrix-test.ss: a textual test 
+ htdp/tests/matrix-client.ss a test with embedded images 
diff --git a/collects/htdp/Test/TEST b/collects/htdp/tests/TEST
similarity index 100%
rename from collects/htdp/Test/TEST
rename to collects/htdp/tests/TEST
diff --git a/collects/htdp/Test/TODO b/collects/htdp/tests/TODO
similarity index 100%
rename from collects/htdp/Test/TODO
rename to collects/htdp/tests/TODO
diff --git a/collects/htdp/Test/arrow-gui.ss b/collects/htdp/tests/arrow-gui.ss
similarity index 100%
rename from collects/htdp/Test/arrow-gui.ss
rename to collects/htdp/tests/arrow-gui.ss
diff --git a/collects/htdp/Test/arrow.ss b/collects/htdp/tests/arrow.ss
similarity index 100%
rename from collects/htdp/Test/arrow.ss
rename to collects/htdp/tests/arrow.ss
diff --git a/collects/htdp/Test/convert.ss b/collects/htdp/tests/convert.ss
similarity index 100%
rename from collects/htdp/Test/convert.ss
rename to collects/htdp/tests/convert.ss
diff --git a/collects/htdp/Test/dir.ss b/collects/htdp/tests/dir.ss
similarity index 100%
rename from collects/htdp/Test/dir.ss
rename to collects/htdp/tests/dir.ss
diff --git a/collects/htdp/Test/docs.ss b/collects/htdp/tests/docs.ss
similarity index 100%
rename from collects/htdp/Test/docs.ss
rename to collects/htdp/tests/docs.ss
diff --git a/collects/htdp/Test/draw.ss b/collects/htdp/tests/draw.ss
similarity index 100%
rename from collects/htdp/Test/draw.ss
rename to collects/htdp/tests/draw.ss
diff --git a/collects/htdp/Test/elevator.ss b/collects/htdp/tests/elevator.ss
similarity index 100%
rename from collects/htdp/Test/elevator.ss
rename to collects/htdp/tests/elevator.ss
diff --git a/collects/htdp/Test/graphing.ss b/collects/htdp/tests/graphing.ss
similarity index 100%
rename from collects/htdp/Test/graphing.ss
rename to collects/htdp/tests/graphing.ss
diff --git a/collects/htdp/Test/guess-gui.ss b/collects/htdp/tests/guess-gui.ss
similarity index 100%
rename from collects/htdp/Test/guess-gui.ss
rename to collects/htdp/tests/guess-gui.ss
diff --git a/collects/htdp/Test/guess1.ss b/collects/htdp/tests/guess1.ss
similarity index 100%
rename from collects/htdp/Test/guess1.ss
rename to collects/htdp/tests/guess1.ss
diff --git a/collects/htdp/Test/guess2.ss b/collects/htdp/tests/guess2.ss
similarity index 100%
rename from collects/htdp/Test/guess2.ss
rename to collects/htdp/tests/guess2.ss
diff --git a/collects/htdp/Test/guess3.ss b/collects/htdp/tests/guess3.ss
similarity index 100%
rename from collects/htdp/Test/guess3.ss
rename to collects/htdp/tests/guess3.ss
diff --git a/collects/htdp/Test/gui.ss b/collects/htdp/tests/gui.ss
similarity index 100%
rename from collects/htdp/Test/gui.ss
rename to collects/htdp/tests/gui.ss
diff --git a/collects/htdp/Test/hangman-error.ss b/collects/htdp/tests/hangman-error.ss
similarity index 100%
rename from collects/htdp/Test/hangman-error.ss
rename to collects/htdp/tests/hangman-error.ss
diff --git a/collects/htdp/Test/hangman1.ss b/collects/htdp/tests/hangman1.ss
similarity index 100%
rename from collects/htdp/Test/hangman1.ss
rename to collects/htdp/tests/hangman1.ss
diff --git a/collects/htdp/Test/lkup-gui.ss b/collects/htdp/tests/lkup-gui.ss
similarity index 100%
rename from collects/htdp/Test/lkup-gui.ss
rename to collects/htdp/tests/lkup-gui.ss
diff --git a/collects/htdp/Test/master.ss b/collects/htdp/tests/master.ss
similarity index 100%
rename from collects/htdp/Test/master.ss
rename to collects/htdp/tests/master.ss
diff --git a/collects/htdp/Test/matrix-client.ss b/collects/htdp/tests/matrix-client.ss
similarity index 100%
rename from collects/htdp/Test/matrix-client.ss
rename to collects/htdp/tests/matrix-client.ss
diff --git a/collects/htdp/Test/matrix-example.ss b/collects/htdp/tests/matrix-example.ss
similarity index 100%
rename from collects/htdp/Test/matrix-example.ss
rename to collects/htdp/tests/matrix-example.ss
diff --git a/collects/htdp/Test/matrix-test.ss b/collects/htdp/tests/matrix-test.ss
similarity index 100%
rename from collects/htdp/Test/matrix-test.ss
rename to collects/htdp/tests/matrix-test.ss
diff --git a/collects/htdp/Test/tester.ss b/collects/htdp/tests/tester.ss
similarity index 100%
rename from collects/htdp/Test/tester.ss
rename to collects/htdp/tests/tester.ss
diff --git a/collects/htdp/Test/world-add-line.ss b/collects/htdp/tests/world-add-line.ss
similarity index 100%
rename from collects/htdp/Test/world-add-line.ss
rename to collects/htdp/tests/world-add-line.ss
diff --git a/collects/htdp/Test/world-mouse.ss b/collects/htdp/tests/world-mouse.ss
similarity index 100%
rename from collects/htdp/Test/world-mouse.ss
rename to collects/htdp/tests/world-mouse.ss
diff --git a/collects/htdp/Test/world.ss b/collects/htdp/tests/world.ss
similarity index 100%
rename from collects/htdp/Test/world.ss
rename to collects/htdp/tests/world.ss