diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 133e956..bc782be 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -103,7 +103,10 @@ EXTRA_DIST += \
 # Test cases
 EXTRA_DIST += \
 	daemon/test_daemon_comm.py \
-	daemon/tests/comm/config_args.tc
+	daemon/tests/config/args.tc \
+	daemon/tests/config/clock.tc \
+	daemon/tests/config/led.tc \
+	daemon/tests/config/mouse.tc
 
 check_PROGRAMS += x52d-mouse-test
 
diff --git a/daemon/tests/comm/config_args.tc b/daemon/tests/config/args.tc
similarity index 100%
rename from daemon/tests/comm/config_args.tc
rename to daemon/tests/config/args.tc
diff --git a/daemon/tests/comm/config_clock.tc b/daemon/tests/config/clock.tc
similarity index 100%
rename from daemon/tests/comm/config_clock.tc
rename to daemon/tests/config/clock.tc
diff --git a/daemon/tests/comm/config_led.tc b/daemon/tests/config/led.tc
similarity index 100%
rename from daemon/tests/comm/config_led.tc
rename to daemon/tests/config/led.tc
diff --git a/daemon/tests/comm/config_mouse.tc b/daemon/tests/config/mouse.tc
similarity index 100%
rename from daemon/tests/comm/config_mouse.tc
rename to daemon/tests/config/mouse.tc