diff --git a/tests/Makefile b/tests/Makefile
index 41149a2e..bb1b1e1a 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -6,7 +6,7 @@ libcommon_a	:= ${top_dir}/_build/lib/libcommon.a
 
 TEST_PATH ?= tests/
 
-TESTS			?= $(shell find ${top_dir}/${TEST_PATH} -name 'sketch.ino' -exec dirname {} \;)
+TESTS			?= $(shell find ${top_dir}/${TEST_PATH} -name '*.ino' -exec dirname {} \;)
 .PHONY: clean cmake-clean all googletest
 
 generate-testcases:
diff --git a/tests/examples/basic-keypress/sketch.ino b/tests/examples/basic-keypress/basic-keypress.ino
similarity index 100%
rename from tests/examples/basic-keypress/sketch.ino
rename to tests/examples/basic-keypress/basic-keypress.ino
diff --git a/tests/features/keycodes/sketch.ino b/tests/features/keycodes/keycodes.ino
similarity index 100%
rename from tests/features/keycodes/sketch.ino
rename to tests/features/keycodes/keycodes.ino
diff --git a/tests/features/layers/activation-order/sketch.ino b/tests/features/layers/activation-order/activation-order.ino
similarity index 100%
rename from tests/features/layers/activation-order/sketch.ino
rename to tests/features/layers/activation-order/activation-order.ino
diff --git a/tests/hid/hid-v1.2-consumer-keys/sketch.ino b/tests/hid/hid-v1.2-consumer-keys/hid-v1.2-consumer-keys.ino
similarity index 100%
rename from tests/hid/hid-v1.2-consumer-keys/sketch.ino
rename to tests/hid/hid-v1.2-consumer-keys/hid-v1.2-consumer-keys.ino
diff --git a/tests/issues/840/sketch.ino b/tests/issues/840/840.ino
similarity index 100%
rename from tests/issues/840/sketch.ino
rename to tests/issues/840/840.ino
diff --git a/tests/issues/941/sketch.ino b/tests/issues/941/941.ino
similarity index 100%
rename from tests/issues/941/sketch.ino
rename to tests/issues/941/941.ino
diff --git a/tests/issues/951/sketch.ino b/tests/issues/951/951.ino
similarity index 100%
rename from tests/issues/951/sketch.ino
rename to tests/issues/951/951.ino
diff --git a/tests/issues/970/sketch.ino b/tests/issues/970/970.ino
similarity index 100%
rename from tests/issues/970/sketch.ino
rename to tests/issues/970/970.ino
diff --git a/tests/issues/978/sketch.ino b/tests/issues/978/978.ino
similarity index 100%
rename from tests/issues/978/sketch.ino
rename to tests/issues/978/978.ino
diff --git a/tests/plugins/Escape-OneShot/basic/sketch.ino b/tests/plugins/Escape-OneShot/basic/basic.ino
similarity index 100%
rename from tests/plugins/Escape-OneShot/basic/sketch.ino
rename to tests/plugins/Escape-OneShot/basic/basic.ino
diff --git a/tests/plugins/Macros/basic/sketch.ino b/tests/plugins/Macros/basic/basic.ino
similarity index 100%
rename from tests/plugins/Macros/basic/sketch.ino
rename to tests/plugins/Macros/basic/basic.ino
diff --git a/tests/plugins/MagicCombo/basic/sketch.ino b/tests/plugins/MagicCombo/basic/basic.ino
similarity index 100%
rename from tests/plugins/MagicCombo/basic/sketch.ino
rename to tests/plugins/MagicCombo/basic/basic.ino
diff --git a/tests/plugins/OneShot/basic/sketch.ino b/tests/plugins/OneShot/basic/basic.ino
similarity index 100%
rename from tests/plugins/OneShot/basic/sketch.ino
rename to tests/plugins/OneShot/basic/basic.ino
diff --git a/tests/plugins/Qukeys/basic/sketch.ino b/tests/plugins/Qukeys/basic/basic.ino
similarity index 100%
rename from tests/plugins/Qukeys/basic/sketch.ino
rename to tests/plugins/Qukeys/basic/basic.ino
diff --git a/tests/plugins/Redial/basic/sketch.ino b/tests/plugins/Redial/basic/basic.ino
similarity index 100%
rename from tests/plugins/Redial/basic/sketch.ino
rename to tests/plugins/Redial/basic/basic.ino
diff --git a/tests/plugins/ShapeShifter/basic/sketch.ino b/tests/plugins/ShapeShifter/basic/basic.ino
similarity index 100%
rename from tests/plugins/ShapeShifter/basic/sketch.ino
rename to tests/plugins/ShapeShifter/basic/basic.ino
diff --git a/tests/plugins/TapDance/basic/sketch.ino b/tests/plugins/TapDance/basic/basic.ino
similarity index 100%
rename from tests/plugins/TapDance/basic/sketch.ino
rename to tests/plugins/TapDance/basic/basic.ino
diff --git a/tests/plugins/TopsyTurvy/basic/sketch.ino b/tests/plugins/TopsyTurvy/basic/basic.ino
similarity index 100%
rename from tests/plugins/TopsyTurvy/basic/sketch.ino
rename to tests/plugins/TopsyTurvy/basic/basic.ino
diff --git a/tests/simulator/timestamps/sketch.ino b/tests/simulator/timestamps/timestamps.ino
similarity index 100%
rename from tests/simulator/timestamps/sketch.ino
rename to tests/simulator/timestamps/timestamps.ino
diff --git a/tests/simulator/timing/sketch.ino b/tests/simulator/timing/timing.ino
similarity index 100%
rename from tests/simulator/timing/sketch.ino
rename to tests/simulator/timing/timing.ino