diff --git a/tests/Makefile b/tests/Makefile
index e2d6bac..3bd8496 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -5,7 +5,13 @@ tests:
 		$(MAKE) -C $$(dirname $$i) -j; \
 	done
 
-runtests: tests
+debugtest:
+	set -e; \
+	$(MAKE) clean; \
+	$(MAKE) -C debug-mode -j; \
+	debug-mode/debug-tests.out
+
+runtests: clean tests
 	set -e; \
 	for i in *-tests/Makefile; do \
 		echo '==== Running:' $$(dirname $$i); \
diff --git a/tests/debug-tests/Makefile b/tests/debug-mode/Makefile
similarity index 100%
rename from tests/debug-tests/Makefile
rename to tests/debug-mode/Makefile
diff --git a/tests/debug-tests/debug-tests.ino b/tests/debug-mode/debug-tests.ino
similarity index 100%
rename from tests/debug-tests/debug-tests.ino
rename to tests/debug-mode/debug-tests.ino