diff --git a/test/unit/python/lib/Makefile b/test/unit/python/jw/Makefile
similarity index 100%
rename from test/unit/python/lib/Makefile
rename to test/unit/python/jw/Makefile
diff --git a/test/unit/python/jw/pkg/Makefile b/test/unit/python/jw/pkg/Makefile
new file mode 100644
index 00000000..8b2498dc
--- /dev/null
+++ b/test/unit/python/jw/pkg/Makefile
@@ -0,0 +1,4 @@
+TOPDIR = ../../../../..
+
+include $(TOPDIR)/make/proj.mk
+include $(JWBDIR)/make/dirs.mk
diff --git a/test/unit/python/jw/pkg/lib/Makefile b/test/unit/python/jw/pkg/lib/Makefile
new file mode 100644
index 00000000..f817ac8c
--- /dev/null
+++ b/test/unit/python/jw/pkg/lib/Makefile
@@ -0,0 +1,4 @@
+TOPDIR = ../../../../../..
+
+include $(TOPDIR)/make/proj.mk
+include $(JWBDIR)/make/dirs.mk
diff --git a/test/unit/python/lib/Uri/Makefile b/test/unit/python/jw/pkg/lib/Uri/Makefile
similarity index 72%
rename from test/unit/python/lib/Uri/Makefile
rename to test/unit/python/jw/pkg/lib/Uri/Makefile
index a2efda8e..de693650 100644
--- a/test/unit/python/lib/Uri/Makefile
+++ b/test/unit/python/jw/pkg/lib/Uri/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../../../../
+TOPDIR = ../../../../../../..
 
 include $(TOPDIR)/make/proj.mk
 include $(JWBDIR)/make/py-run.mk
diff --git a/test/unit/python/lib/Uri/test.py b/test/unit/python/jw/pkg/lib/Uri/test.py
similarity index 100%
rename from test/unit/python/lib/Uri/test.py
rename to test/unit/python/jw/pkg/lib/Uri/test.py