diff --git a/taxonomy/Makefile b/taxonomy/Makefile
index 6a04a8b..6c20ed6 100644
--- a/taxonomy/Makefile
+++ b/taxonomy/Makefile
@@ -4,7 +4,7 @@
 
 test:
 	set -e; \
-	for d in $(wildcard *_test.py); do \
+	for d in $(wildcard tests/*_test.py); do \
 		PYTHONPATH=. $(PYTHON) $$d; \
 	done
 
diff --git a/taxonomy/dhcp_test.py b/taxonomy/tests/dhcp_test.py
similarity index 100%
rename from taxonomy/dhcp_test.py
rename to taxonomy/tests/dhcp_test.py
diff --git a/taxonomy/ethernet_test.py b/taxonomy/tests/ethernet_test.py
similarity index 100%
rename from taxonomy/ethernet_test.py
rename to taxonomy/tests/ethernet_test.py
diff --git a/taxonomy/ssdp_test.py b/taxonomy/tests/ssdp_test.py
similarity index 100%
rename from taxonomy/ssdp_test.py
rename to taxonomy/tests/ssdp_test.py
diff --git a/taxonomy/wifi_test.py b/taxonomy/tests/wifi_test.py
similarity index 100%
rename from taxonomy/wifi_test.py
rename to taxonomy/tests/wifi_test.py
diff --git a/waveguide/Makefile b/waveguide/Makefile
index 62c875e..c75da49 100644
--- a/waveguide/Makefile
+++ b/waveguide/Makefile
@@ -39,7 +39,7 @@
 
 install:
 	mkdir -p $(LIBDIR) $(BINDIR)
-	$(INSTALL) -m 0644 *.py $(LIBDIR)/
+	$(INSTALL) -m 0644 $(filter-out %_test.py, $(wildcard *.py)) $(LIBDIR)/
 	$(INSTALL) -m 0755 waveguide.py $(LIBDIR)/
 	$(INSTALL) -m 0755 waveguide $(BINDIR)/
 
diff --git a/wifi/Makefile b/wifi/Makefile
index af80e88..c6aa330 100644
--- a/wifi/Makefile
+++ b/wifi/Makefile
@@ -34,7 +34,7 @@
 
 install:
 	mkdir -p $(LIBDIR) $(BINDIR)
-	$(INSTALL) -m 0644 *.py $(LIBDIR)/
+	$(INSTALL) -m 0644 $(filter-out %_test.py, $(wildcard *.py)) $(LIBDIR)/
 	$(INSTALL) -m 0755 wifi.py $(LIBDIR)/
 	rm -f $(BINDIR)/wifi
 	ln -s /usr/wifi/wifi.py $(BINDIR)/wifi