diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index 592f451c3e..253fae962b 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -90,6 +90,7 @@ include $(PROJECT_DIR)/hw_layer/hw_layer.mk
 include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
 include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
 include test.mk
+include tests/tests.mk
 
 # Define linker script file here
 #LDSCRIPT= config/system/STM32F407xG.ld
@@ -118,7 +119,8 @@ CPPSRC = $(UTILSRC_CPP) \
 	$(CONTROLLERS_CORE_SRC_CPP) \
 	$(CONTROLLERS_MATH_SRC_CPP) \
 	$(CONTROLLERS_SENSORS_SRC_CPP) \
-	$(TEST_SRC_CPP) \
+	$(FRAMEWORK_SRC_CPP) \
+	$(TESTS_SRC_CPP) \
 	$(SYSTEMSRC_CPP) \
 	$(HW_LAYER_EMS_CPP) \
 	$(HW_SENSORS_SRC) \
diff --git a/unit_tests/test.mk b/unit_tests/test.mk
index 1f18ba2c54..73e191a4eb 100644
--- a/unit_tests/test.mk
+++ b/unit_tests/test.mk
@@ -1,34 +1,9 @@
-TEST_SRC_CPP = unit_test_framework.cpp \
+FRAMEWORK_SRC_CPP = unit_test_framework.cpp \
 	engine_test_helper.cpp \
 	boards.cpp \
 	global_execution_queue.cpp \
 	test_basic_math/test_find_index.cpp \
 	test_basic_math/test_interpolation_3d.cpp \
 	test_basic_math/test_efilib.cpp \
-	tests/test_util.cpp \
-	tests/test_ion.cpp \
-	tests/test_on_demand_parameters.cpp \
-	tests/test_hip9011.cpp \
-	tests/test_cj125.cpp \
-	tests/test_cam_vtt_input.cpp \
-	tests/test_engine_math.cpp \
-	tests/test_startOfCrankingPrimingPulse.cpp \
-	tests/test_miata_na6_real_cranking.cpp \
-	tests/test_fasterEngineSpinningUp.cpp \
-	tests/test_idle_controller.cpp \
-	tests/test_trigger_decoder.cpp \
-	tests/test_trigger_noiseless.cpp \
-	tests/test_fuel_map.cpp \
-	tests/test_maf2map.cpp \
-	tests/test_fuelCut.cpp \
-	tests/test_trigger_multi_sync.cpp \
-	tests/test_pwm_generator.cpp \
-	tests/test_logic_expression.cpp \
-	tests/test_speed_density.cpp \
-	tests/test_signal_executor.cpp \
-	tests/test_sensors.cpp \
-	tests/test_pid_auto.cpp \
-	tests/test_accel_enrichment.cpp \
-	tests/test_gpiochip.cpp \
 	afm2mapConverter.cpp
 	
diff --git a/unit_tests/tests/tests.mk b/unit_tests/tests/tests.mk
new file mode 100644
index 0000000000..2f8ef988ff
--- /dev/null
+++ b/unit_tests/tests/tests.mk
@@ -0,0 +1,26 @@
+TESTS_SRC_CPP = \
+	tests/test_util.cpp \
+	tests/test_ion.cpp \
+	tests/test_on_demand_parameters.cpp \
+	tests/test_hip9011.cpp \
+	tests/test_cj125.cpp \
+	tests/test_cam_vtt_input.cpp \
+	tests/test_engine_math.cpp \
+	tests/test_startOfCrankingPrimingPulse.cpp \
+	tests/test_miata_na6_real_cranking.cpp \
+	tests/test_fasterEngineSpinningUp.cpp \
+	tests/test_idle_controller.cpp \
+	tests/test_trigger_decoder.cpp \
+	tests/test_trigger_noiseless.cpp \
+	tests/test_fuel_map.cpp \
+	tests/test_maf2map.cpp \
+	tests/test_fuelCut.cpp \
+	tests/test_trigger_multi_sync.cpp \
+	tests/test_pwm_generator.cpp \
+	tests/test_logic_expression.cpp \
+	tests/test_speed_density.cpp \
+	tests/test_signal_executor.cpp \
+	tests/test_sensors.cpp \
+	tests/test_pid_auto.cpp \
+	tests/test_accel_enrichment.cpp \
+	tests/test_gpiochip.cpp