diff --git a/Makefile b/Makefile
index e591f367..6974acc2 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ pretest:
 	python scripts/gen_individual_importing_tests.py
 
 TEST_ENV = PYTHONPATH="`pwd`:`pwd`/tests/lib"
-TEST_FILES = tests/style/*.t tests/board_gen/*.py tests/individually-importing/*.py
+TEST_FILES = tests/style/*.t tests/unit/*.py tests/individually-importing/*.py
 
 define RUN_TESTS
 $(TEST_ENV) $1 $(TEST_FILES)
diff --git a/tests/board_gen/acard_unit.py b/tests/unit/acard_unit.py
similarity index 100%
rename from tests/board_gen/acard_unit.py
rename to tests/unit/acard_unit.py
diff --git a/tests/board_gen/latin1_conv_unit.py b/tests/unit/latin1_conv_unit.py
similarity index 100%
rename from tests/board_gen/latin1_conv_unit.py
rename to tests/unit/latin1_conv_unit.py
diff --git a/tests/board_gen/ms_deals1.py b/tests/unit/ms_deals1.py
similarity index 100%
rename from tests/board_gen/ms_deals1.py
rename to tests/unit/ms_deals1.py
diff --git a/tests/board_gen/ms_deals1_py3.py b/tests/unit/ms_deals1_py3.py
similarity index 100%
rename from tests/board_gen/ms_deals1_py3.py
rename to tests/unit/ms_deals1_py3.py