diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/TEST b/pkgs/htdp-pkgs/htdp-test/htdp/tests/TEST
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/TEST
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/TEST
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/TODO b/pkgs/htdp-pkgs/htdp-test/htdp/tests/TODO
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/TODO
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/TODO
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/arrow-gui.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/arrow-gui.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/arrow-gui.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/arrow-gui.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/arrow.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/arrow.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/arrow.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/arrow.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-error.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-error.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-error.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-error.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-error.txt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-error.txt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-error.txt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-error.txt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-non-error.txt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-non-error.txt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert-drracket-non-error.txt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/convert-drracket-non-error.txt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/convert.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/convert.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/dir.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/dir.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/dir.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/dir.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/docs.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/docs.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/docs.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/docs.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/draw.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/draw.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/draw.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/draw.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/elevator.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/elevator.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/elevator.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/elevator.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/graphing.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/graphing.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/graphing.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/graphing.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess1.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess1.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess1.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/guess1.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess2.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess2.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess2.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/guess2.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess3.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/guess3.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/guess3.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/guess3.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/gui.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/gui.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/gui.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/gui.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/hangman-error.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/hangman-error.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/hangman-error.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/hangman-error.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/hangman1.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/hangman1.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/hangman1.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/hangman1.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/lkup-gui.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/lkup-gui.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/lkup-gui.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/lkup-gui.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/master.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/master.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/master.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/master.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-client.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-client.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-client.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-client.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-example.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-example.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-example.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-example.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-test.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-test.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-test.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-test.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/test-docs-complete.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/test-docs-complete.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/test-docs-complete.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/test-docs-complete.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/tester.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/tester.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/tester.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/tester.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/world-add-line.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/world-add-line.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/world-add-line.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/world-add-line.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/world-mouse.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/world-mouse.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/world-mouse.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/world-mouse.rkt
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/tests/world.rkt b/pkgs/htdp-pkgs/htdp-test/htdp/tests/world.rkt
similarity index 100%
rename from pkgs/htdp-pkgs/htdp-lib/htdp/tests/world.rkt
rename to pkgs/htdp-pkgs/htdp-test/htdp/tests/world.rkt
diff --git a/pkgs/plt-services/meta/props b/pkgs/plt-services/meta/props
index a5402c5f44..87393cddfb 100755
--- a/pkgs/plt-services/meta/props
+++ b/pkgs/plt-services/meta/props
@@ -861,28 +861,6 @@ path/s is either such a string or a list of them.
 "pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-core.rkt" responsible (robby)
 "pkgs/htdp-pkgs/htdp-lib/2htdp/private/image-more.rkt" responsible (robby)
 "pkgs/htdp-pkgs/htdp-lib/2htdp/private/img-err.rkt" responsible (robby)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/full-scene-visible.rkt" drdr:command-line (gracket *)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/image-equality-performance-htdp.rkt" responsible (robby)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/image-equality-performance.rkt" responsible (robby)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/jpr-bug.rkt" drdr:command-line #f
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/mouse-evt.rkt" drdr:command-line #f
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/mp.rkt" drdr:command-line #f
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/on-release-no-key.rkt" drdr:command-line (raco "make" *)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/on-tick-universe-with-limit.rkt" drdr:command-line (gracket *)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/pad1.rkt" drdr:command-line (raco "make" *)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/perform-record.rkt" drdr:command-line (gracket *) drdr:timeout 300
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/perform-robby.rkt" drdr:command-line (gracket *)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/perform-whack.rkt" drdr:command-line #f
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/profile-robby.rkt" drdr:command-line #f
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/record-stop-when.rkt" drdr:command-line (gracket *)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/record.rkt" drdr:command-line (gracket *)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/release.rkt" drdr:command-line (gracket *)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/struct-universe.rkt" drdr:command-line (gracket *) drdr:random #t
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/test-image.rkt" responsible (robby)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/ufo-rename.rkt" drdr:command-line (gracket *)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/universe-receive.rkt" drdr:command-line (raco "make" *)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/universe-restart.rkt" drdr:command-line (gracket *)
-"pkgs/htdp-pkgs/htdp-lib/2htdp/tests/world0-stops.rkt" drdr:command-line (gracket *)
 "pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/chatter.rkt" drdr:command-line (mzc "-k" *)
 "pkgs/htdp-pkgs/htdp-lib/2htdp/uchat/server.rkt" drdr:command-line (mzc "-k" *)
 "pkgs/htdp-pkgs/htdp-lib/2htdp/utest/balls.rkt" drdr:command-line (mzc *)
@@ -892,21 +870,43 @@ path/s is either such a string or a list of them.
 "pkgs/htdp-pkgs/htdp-lib/graphics/turtle-test.rkt" drdr:command-line (mzc "-k" *)
 "pkgs/htdp-pkgs/htdp-lib/graphics/value-turtles-test.rkt" drdr:command-line (mzc *)
 "pkgs/htdp-pkgs/htdp-lib/htdp/graphing.rkt" drdr:command-line (mzc *)
-"pkgs/htdp-pkgs/htdp-lib/htdp/tests/convert.rkt" drdr:command-line (mzc *)
-"pkgs/htdp-pkgs/htdp-lib/htdp/tests/dir.rkt" drdr:command-line #f
-"pkgs/htdp-pkgs/htdp-lib/htdp/tests/elevator.rkt" drdr:command-line (mzc *)
-"pkgs/htdp-pkgs/htdp-lib/htdp/tests/graphing.rkt" drdr:command-line (mzc *)
-"pkgs/htdp-pkgs/htdp-lib/htdp/tests/gui.rkt" responsible (robby) drdr:command-line (mzc *)
-"pkgs/htdp-pkgs/htdp-lib/htdp/tests/hangman-error.rkt" drdr:command-line (mzc *)
-"pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-client.rkt" drdr:command-line #f
-"pkgs/htdp-pkgs/htdp-lib/htdp/tests/matrix-example.rkt" drdr:command-line #f
-"pkgs/htdp-pkgs/htdp-lib/htdp/tests/world-mouse.rkt" drdr:command-line (mzc *)
 "pkgs/htdp-pkgs/htdp-lib/stepper" responsible (clements)
 "pkgs/htdp-pkgs/htdp-lib/teachpack" responsible (matthias)
 "pkgs/htdp-pkgs/htdp-lib/teachpack/balls.ss" drdr:command-line (mzc *)
 "pkgs/htdp-pkgs/htdp-lib/teachpack/deinprogramm" responsible (sperber)
 "pkgs/htdp-pkgs/htdp-lib/teachpack/htdp/graphing.rkt" drdr:command-line (mzc *)
 "pkgs/htdp-pkgs/htdp-lib/test-engine" responsible (kathyg)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/full-scene-visible.rkt" drdr:command-line (gracket *)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/image-equality-performance-htdp.rkt" responsible (robby)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/image-equality-performance.rkt" responsible (robby)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/jpr-bug.rkt" drdr:command-line #f
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/mouse-evt.rkt" drdr:command-line #f
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/mp.rkt" drdr:command-line #f
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-release-no-key.rkt" drdr:command-line (raco "make" *)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-universe-with-limit.rkt" drdr:command-line (gracket *)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/pad1.rkt" drdr:command-line (raco "make" *)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-record.rkt" drdr:command-line (gracket *) drdr:timeout 300
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-robby.rkt" drdr:command-line (gracket *)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-whack.rkt" drdr:command-line #f
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/profile-robby.rkt" drdr:command-line #f
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/record-stop-when.rkt" drdr:command-line (gracket *)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/record.rkt" drdr:command-line (gracket *)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/release.rkt" drdr:command-line (gracket *)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/struct-universe.rkt" drdr:command-line (gracket *) drdr:random #t
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/test-image.rkt" responsible (robby)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/ufo-rename.rkt" drdr:command-line (gracket *)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-receive.rkt" drdr:command-line (raco "make" *)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-restart.rkt" drdr:command-line (gracket *)
+"pkgs/htdp-pkgs/htdp-test/2htdp/tests/world0-stops.rkt" drdr:command-line (gracket *)
+"pkgs/htdp-pkgs/htdp-test/htdp/tests/convert.rkt" drdr:command-line (mzc *)
+"pkgs/htdp-pkgs/htdp-test/htdp/tests/dir.rkt" drdr:command-line #f
+"pkgs/htdp-pkgs/htdp-test/htdp/tests/elevator.rkt" drdr:command-line (mzc *)
+"pkgs/htdp-pkgs/htdp-test/htdp/tests/graphing.rkt" drdr:command-line (mzc *)
+"pkgs/htdp-pkgs/htdp-test/htdp/tests/gui.rkt" responsible (robby) drdr:command-line (mzc *)
+"pkgs/htdp-pkgs/htdp-test/htdp/tests/hangman-error.rkt" drdr:command-line (mzc *)
+"pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-client.rkt" drdr:command-line #f
+"pkgs/htdp-pkgs/htdp-test/htdp/tests/matrix-example.rkt" drdr:command-line #f
+"pkgs/htdp-pkgs/htdp-test/htdp/tests/world-mouse.rkt" drdr:command-line (mzc *)
 "pkgs/htdp-pkgs/htdp-test/tests/htdp-lang" responsible (robby mflatt matthias)
 "pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/advanced.rktl" drdr:timeout 360
 "pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/beg-adv.rktl" drdr:command-line #f