diff --git a/unit_tests/tests/test_fuel_map.cpp b/unit_tests/tests/ignition_injection/test_fuel_map.cpp
similarity index 100%
rename from unit_tests/tests/test_fuel_map.cpp
rename to unit_tests/tests/ignition_injection/test_fuel_map.cpp
diff --git a/unit_tests/tests/test_fuel_math.cpp b/unit_tests/tests/ignition_injection/test_fuel_math.cpp
similarity index 100%
rename from unit_tests/tests/test_fuel_math.cpp
rename to unit_tests/tests/ignition_injection/test_fuel_math.cpp
diff --git a/unit_tests/tests/test_fuel_wall_wetting.cpp b/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp
similarity index 100%
rename from unit_tests/tests/test_fuel_wall_wetting.cpp
rename to unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp
diff --git a/unit_tests/tests/test_one_cylinder_logic.cpp b/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp
similarity index 100%
rename from unit_tests/tests/test_one_cylinder_logic.cpp
rename to unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp
diff --git a/unit_tests/tests/test_cj125.cpp b/unit_tests/tests/sensor/test_cj125.cpp
similarity index 100%
rename from unit_tests/tests/test_cj125.cpp
rename to unit_tests/tests/sensor/test_cj125.cpp
diff --git a/unit_tests/tests/tests.mk b/unit_tests/tests/tests.mk
index b65b2817f0..76b9d0a819 100644
--- a/unit_tests/tests/tests.mk
+++ b/unit_tests/tests/tests.mk
@@ -14,6 +14,7 @@ TESTS_SRC_CPP = \
 	tests/ignition_injection/test_fuelCut.cpp \
 	tests/ignition_injection/test_fuel_computer.cpp \
 	tests/ignition_injection/test_injector_model.cpp \
+	tests/sensor/test_cj125.cpp \
 	tests/util/test_buffered_writer.cpp \
 	tests/test_util.cpp \
 	tests/test_start_stop.cpp \
@@ -22,7 +23,6 @@ TESTS_SRC_CPP = \
 	tests/test_aux_valves.cpp \
 	tests/test_on_demand_parameters.cpp \
 	tests/test_hip9011.cpp \
-	tests/test_cj125.cpp \
 	tests/test_engine_math.cpp \
 	tests/test_fasterEngineSpinningUp.cpp \
 	tests/test_dwell_corner_case_issue_796.cpp \
@@ -31,7 +31,7 @@ TESTS_SRC_CPP = \
 	tests/test_etb.cpp \
 	tests/test_launch.cpp \
 	tests/test_fuel_map.cpp \
-	tests/test_fuel_wall_wetting.cpp \
+	tests/ignition_injection/test_fuel_wall_wetting.cpp \
 	tests/test_one_cylinder_logic.cpp \
 	tests/test_tunerstudio.cpp \
 	tests/test_pwm_generator.cpp \
@@ -56,7 +56,7 @@ TESTS_SRC_CPP = \
 	tests/sensor/func_chain.cpp \
 	tests/sensor/redundant.cpp \
 	tests/sensor/test_sensor_init.cpp \
-	tests/test_closed_loop_controller.cpp \
+	tests/util/test_closed_loop_controller.cpp \
 	tests/test_stft.cpp \
 	tests/test_boost.cpp \
 	tests/test_gppwm.cpp \
@@ -65,5 +65,5 @@ TESTS_SRC_CPP = \
 	tests/test_dynoview.cpp \
 	tests/test_gpio.cpp \
 	tests/test_limp.cpp \
-	tests/test_all_triggers.cpp \
+	tests/trigger/test_all_triggers.cpp \
 
diff --git a/unit_tests/tests/test_all_triggers.cpp b/unit_tests/tests/trigger/test_all_triggers.cpp
similarity index 100%
rename from unit_tests/tests/test_all_triggers.cpp
rename to unit_tests/tests/trigger/test_all_triggers.cpp
diff --git a/unit_tests/tests/test_fasterEngineSpinningUp.cpp b/unit_tests/tests/trigger/test_fasterEngineSpinningUp.cpp
similarity index 100%
rename from unit_tests/tests/test_fasterEngineSpinningUp.cpp
rename to unit_tests/tests/trigger/test_fasterEngineSpinningUp.cpp
diff --git a/unit_tests/tests/test_issue_898.cpp b/unit_tests/tests/trigger/test_issue_898.cpp
similarity index 100%
rename from unit_tests/tests/test_issue_898.cpp
rename to unit_tests/tests/trigger/test_issue_898.cpp
diff --git a/unit_tests/tests/test_closed_loop_controller.cpp b/unit_tests/tests/util/test_closed_loop_controller.cpp
similarity index 100%
rename from unit_tests/tests/test_closed_loop_controller.cpp
rename to unit_tests/tests/util/test_closed_loop_controller.cpp