diff --git a/unit_tests/tests/test_dwell_corner_case_issue_796.cpp b/unit_tests/tests/ignition_injection/test_dwell_corner_case_issue_796.cpp
similarity index 100%
rename from unit_tests/tests/test_dwell_corner_case_issue_796.cpp
rename to unit_tests/tests/ignition_injection/test_dwell_corner_case_issue_796.cpp
diff --git a/unit_tests/tests/test_fuelCut.cpp b/unit_tests/tests/ignition_injection/test_fuelCut.cpp
similarity index 100%
rename from unit_tests/tests/test_fuelCut.cpp
rename to unit_tests/tests/ignition_injection/test_fuelCut.cpp
diff --git a/unit_tests/tests/test_ignition_scheduling.cpp b/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp
similarity index 100%
rename from unit_tests/tests/test_ignition_scheduling.cpp
rename to unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp
diff --git a/unit_tests/tests/test_miata_na6_real_cranking.cpp b/unit_tests/tests/ignition_injection/test_miata_na6_real_cranking.cpp
similarity index 100%
rename from unit_tests/tests/test_miata_na6_real_cranking.cpp
rename to unit_tests/tests/ignition_injection/test_miata_na6_real_cranking.cpp
diff --git a/unit_tests/tests/test_multispark.cpp b/unit_tests/tests/ignition_injection/test_multispark.cpp
similarity index 100%
rename from unit_tests/tests/test_multispark.cpp
rename to unit_tests/tests/ignition_injection/test_multispark.cpp
diff --git a/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp b/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp
similarity index 100%
rename from unit_tests/tests/test_startOfCrankingPrimingPulse.cpp
rename to unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp
diff --git a/unit_tests/tests/tests.mk b/unit_tests/tests/tests.mk
index 0985abc618..d74830dccd 100644
--- a/unit_tests/tests/tests.mk
+++ b/unit_tests/tests/tests.mk
@@ -6,6 +6,12 @@ TESTS_SRC_CPP = \
 	tests/trigger/test_cam_vvt_input.cpp \
 	tests/trigger/test_2jz_vvt.cpp \
 	tests/trigger/test_injection_scheduling.cpp \
+	tests/ignition_injection/test_dwell_corner_case_issue_796.cpp \
+	tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp \
+	tests/ignition_injection/test_miata_na6_real_cranking.cpp \
+	tests/ignition_injection/test_ignition_scheduling.cpp \
+	tests/ignition_injection/test_multispark.cpp \
+	tests/ignition_injection/test_fuelCut.cpp \
 	tests/test_util.cpp \
 	tests/test_ion.cpp \
 	tests/test_aux_valves.cpp \
@@ -13,18 +19,13 @@ TESTS_SRC_CPP = \
 	tests/test_hip9011.cpp \
 	tests/test_cj125.cpp \
 	tests/test_engine_math.cpp \
-	tests/test_startOfCrankingPrimingPulse.cpp \
-	tests/test_miata_na6_real_cranking.cpp \
 	tests/test_fasterEngineSpinningUp.cpp \
-	tests/test_dwell_corner_case_issue_796.cpp \
 	tests/test_idle_controller.cpp \
 	tests/test_issue_898.cpp \
 	tests/test_etb.cpp \
-	tests/test_ignition_scheduling.cpp \
 	tests/test_fuel_map.cpp \
 	tests/test_fuel_wall_wetting.cpp \
 	tests/test_one_cylinder_logic.cpp \
-	tests/test_fuelCut.cpp \
 	tests/test_pwm_generator.cpp \
 	tests/test_logic_expression.cpp \
 	tests/test_speed_density.cpp \
@@ -36,7 +37,6 @@ TESTS_SRC_CPP = \
 	tests/test_accel_enrichment.cpp \
 	tests/test_tacho.cpp \
 	tests/test_gpiochip.cpp \
-	tests/test_multispark.cpp \
 	tests/test_deadband.cpp \
 	tests/sensor/basic_sensor.cpp \
 	tests/sensor/func_sensor.cpp \