diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt
index 3e6e1a0..354e113 100644
--- a/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt
+++ b/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt
@@ -11,5 +11,6 @@
                "unstable-list-lib"
                "macro-debugger-text-lib"
                "unstable"))
-(define build-deps '("scribble-lib"
+(define build-deps '("rackunit-lib"
+                     "scribble-lib"
                      "racket-doc"))
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/all-tests.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/all-tests.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/all-tests.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/all-tests.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/check-requires/src-a.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-a.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/check-requires/src-a.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-a.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/check-requires/src-b.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-b.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/check-requires/src-b.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-b.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/check-requires/src-c.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-c.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/check-requires/src-c.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/src-c.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/check-requires/use-a.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-a.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/check-requires/use-a.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-a.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/check-requires/use-cs.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-cs.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/check-requires/use-cs.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/check-requires/use-cs.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/gentest-framework.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentest-framework.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/gentest-framework.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentest-framework.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/gentests.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentests.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/gentests.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gentests.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/gui-tests.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gui-tests.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/gui-tests.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/gui-tests.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/test-setup.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/test-setup.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/test-setup.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/test-setup.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/collects.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/collects.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/collects.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/collects.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/hiding.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/hiding.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/hiding.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/hiding.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/policy.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/policy.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/policy.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/policy.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/regression.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/regression.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/regression.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/regression.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/syntax-basic.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-basic.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/syntax-basic.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-basic.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/syntax-errors.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-errors.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/syntax-errors.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-errors.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/syntax-macros.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-macros.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/syntax-macros.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-macros.rkt
diff --git a/pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/syntax-modules.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-modules.rkt
similarity index 100%
rename from pkgs/racket-pkgs/racket-test/tests/macro-debugger/tests/syntax-modules.rkt
rename to pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/syntax-modules.rkt