diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index aa8b44ad35..84277ccd55 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -172,6 +172,7 @@ INCDIR = . \
 	test_data_structures \
 	googletest/googletest \
 	googletest/googletest/include \
+	tests \
 	test_basic_math
 	
 
diff --git a/unit_tests/test.mk b/unit_tests/test.mk
index 7da51abf62..161bf396e6 100644
--- a/unit_tests/test.mk
+++ b/unit_tests/test.mk
@@ -1,27 +1,27 @@
-TEST_SRC_CPP = test_util.cpp \
-	unit_test_framework.cpp \
+TEST_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_cj125.cpp \
-	test_ion.cpp \
-	test_hip9011.cpp \
-	test_data_structures/test_engine_math.cpp \
-	test_startOfCrankingPrimingPulse.cpp \
-	test_fasterEngineSpinningUp.cpp \
-	test_idle_controller.cpp \
-	test_trigger_decoder.cpp \
-	test_trigger_noiseless.cpp \
-	test_fuel_map.cpp \
-	test_fuelCut.cpp \
-	engine_test_helper.cpp \
-	test_pwm_generator.cpp \
-	test_logic_expression.cpp \
-	test_speed_density.cpp \
-	test_signal_executor.cpp \
-	test_sensors.cpp \
-	test_pid_auto.cpp \
-	test_accel_enrichment.cpp \
+	tests/test_util.cpp \
+	tests/test_ion.cpp \
+	tests/test_hip9011.cpp \
+	tests/test_cj125.cpp \
+	tests/test_engine_math.cpp \
+	tests/test_startOfCrankingPrimingPulse.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_fuelCut.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 \
 	afm2mapConverter.cpp
 	
diff --git a/unit_tests/test_accel_enrichment.cpp b/unit_tests/tests/test_accel_enrichment.cpp
similarity index 100%
rename from unit_tests/test_accel_enrichment.cpp
rename to unit_tests/tests/test_accel_enrichment.cpp
diff --git a/unit_tests/test_accel_enrichment.h b/unit_tests/tests/test_accel_enrichment.h
similarity index 100%
rename from unit_tests/test_accel_enrichment.h
rename to unit_tests/tests/test_accel_enrichment.h
diff --git a/unit_tests/test_cj125.cpp b/unit_tests/tests/test_cj125.cpp
similarity index 100%
rename from unit_tests/test_cj125.cpp
rename to unit_tests/tests/test_cj125.cpp
diff --git a/unit_tests/test_engine_math.cpp b/unit_tests/tests/test_engine_math.cpp
similarity index 100%
rename from unit_tests/test_engine_math.cpp
rename to unit_tests/tests/test_engine_math.cpp
diff --git a/unit_tests/test_engine_math.h b/unit_tests/tests/test_engine_math.h
similarity index 100%
rename from unit_tests/test_engine_math.h
rename to unit_tests/tests/test_engine_math.h
diff --git a/unit_tests/test_fasterEngineSpinningUp.cpp b/unit_tests/tests/test_fasterEngineSpinningUp.cpp
similarity index 100%
rename from unit_tests/test_fasterEngineSpinningUp.cpp
rename to unit_tests/tests/test_fasterEngineSpinningUp.cpp
diff --git a/unit_tests/test_fasterEngineSpinningUp.h b/unit_tests/tests/test_fasterEngineSpinningUp.h
similarity index 100%
rename from unit_tests/test_fasterEngineSpinningUp.h
rename to unit_tests/tests/test_fasterEngineSpinningUp.h
diff --git a/unit_tests/test_fuelCut.cpp b/unit_tests/tests/test_fuelCut.cpp
similarity index 100%
rename from unit_tests/test_fuelCut.cpp
rename to unit_tests/tests/test_fuelCut.cpp
diff --git a/unit_tests/test_fuelCut.h b/unit_tests/tests/test_fuelCut.h
similarity index 100%
rename from unit_tests/test_fuelCut.h
rename to unit_tests/tests/test_fuelCut.h
diff --git a/unit_tests/test_fuel_map.cpp b/unit_tests/tests/test_fuel_map.cpp
similarity index 100%
rename from unit_tests/test_fuel_map.cpp
rename to unit_tests/tests/test_fuel_map.cpp
diff --git a/unit_tests/test_fuel_map.h b/unit_tests/tests/test_fuel_map.h
similarity index 100%
rename from unit_tests/test_fuel_map.h
rename to unit_tests/tests/test_fuel_map.h
diff --git a/unit_tests/test_hip9011.cpp b/unit_tests/tests/test_hip9011.cpp
similarity index 100%
rename from unit_tests/test_hip9011.cpp
rename to unit_tests/tests/test_hip9011.cpp
diff --git a/unit_tests/test_idle_controller.cpp b/unit_tests/tests/test_idle_controller.cpp
similarity index 100%
rename from unit_tests/test_idle_controller.cpp
rename to unit_tests/tests/test_idle_controller.cpp
diff --git a/unit_tests/test_idle_controller.h b/unit_tests/tests/test_idle_controller.h
similarity index 100%
rename from unit_tests/test_idle_controller.h
rename to unit_tests/tests/test_idle_controller.h
diff --git a/unit_tests/test_ion.cpp b/unit_tests/tests/test_ion.cpp
similarity index 100%
rename from unit_tests/test_ion.cpp
rename to unit_tests/tests/test_ion.cpp
diff --git a/unit_tests/test_logic_expression.cpp b/unit_tests/tests/test_logic_expression.cpp
similarity index 100%
rename from unit_tests/test_logic_expression.cpp
rename to unit_tests/tests/test_logic_expression.cpp
diff --git a/unit_tests/test_logic_expression.h b/unit_tests/tests/test_logic_expression.h
similarity index 100%
rename from unit_tests/test_logic_expression.h
rename to unit_tests/tests/test_logic_expression.h
diff --git a/unit_tests/test_pid_auto.cpp b/unit_tests/tests/test_pid_auto.cpp
similarity index 100%
rename from unit_tests/test_pid_auto.cpp
rename to unit_tests/tests/test_pid_auto.cpp
diff --git a/unit_tests/test_pid_auto.h b/unit_tests/tests/test_pid_auto.h
similarity index 100%
rename from unit_tests/test_pid_auto.h
rename to unit_tests/tests/test_pid_auto.h
diff --git a/unit_tests/test_pwm_generator.cpp b/unit_tests/tests/test_pwm_generator.cpp
similarity index 100%
rename from unit_tests/test_pwm_generator.cpp
rename to unit_tests/tests/test_pwm_generator.cpp
diff --git a/unit_tests/test_sensors.cpp b/unit_tests/tests/test_sensors.cpp
similarity index 100%
rename from unit_tests/test_sensors.cpp
rename to unit_tests/tests/test_sensors.cpp
diff --git a/unit_tests/test_sensors.h b/unit_tests/tests/test_sensors.h
similarity index 100%
rename from unit_tests/test_sensors.h
rename to unit_tests/tests/test_sensors.h
diff --git a/unit_tests/test_signal_executor.cpp b/unit_tests/tests/test_signal_executor.cpp
similarity index 100%
rename from unit_tests/test_signal_executor.cpp
rename to unit_tests/tests/test_signal_executor.cpp
diff --git a/unit_tests/test_signal_executor.h b/unit_tests/tests/test_signal_executor.h
similarity index 100%
rename from unit_tests/test_signal_executor.h
rename to unit_tests/tests/test_signal_executor.h
diff --git a/unit_tests/test_speed_density.cpp b/unit_tests/tests/test_speed_density.cpp
similarity index 100%
rename from unit_tests/test_speed_density.cpp
rename to unit_tests/tests/test_speed_density.cpp
diff --git a/unit_tests/test_speed_density.h b/unit_tests/tests/test_speed_density.h
similarity index 100%
rename from unit_tests/test_speed_density.h
rename to unit_tests/tests/test_speed_density.h
diff --git a/unit_tests/test_startOfCrankingPrimingPulse.cpp b/unit_tests/tests/test_startOfCrankingPrimingPulse.cpp
similarity index 100%
rename from unit_tests/test_startOfCrankingPrimingPulse.cpp
rename to unit_tests/tests/test_startOfCrankingPrimingPulse.cpp
diff --git a/unit_tests/test_startOfCrankingPrimingPulse.h b/unit_tests/tests/test_startOfCrankingPrimingPulse.h
similarity index 100%
rename from unit_tests/test_startOfCrankingPrimingPulse.h
rename to unit_tests/tests/test_startOfCrankingPrimingPulse.h
diff --git a/unit_tests/test_trigger_decoder.cpp b/unit_tests/tests/test_trigger_decoder.cpp
similarity index 100%
rename from unit_tests/test_trigger_decoder.cpp
rename to unit_tests/tests/test_trigger_decoder.cpp
diff --git a/unit_tests/test_trigger_decoder.h b/unit_tests/tests/test_trigger_decoder.h
similarity index 100%
rename from unit_tests/test_trigger_decoder.h
rename to unit_tests/tests/test_trigger_decoder.h
diff --git a/unit_tests/test_trigger_noiseless.cpp b/unit_tests/tests/test_trigger_noiseless.cpp
similarity index 100%
rename from unit_tests/test_trigger_noiseless.cpp
rename to unit_tests/tests/test_trigger_noiseless.cpp
diff --git a/unit_tests/test_util.cpp b/unit_tests/tests/test_util.cpp
similarity index 100%
rename from unit_tests/test_util.cpp
rename to unit_tests/tests/test_util.cpp
diff --git a/unit_tests/test_util.h b/unit_tests/tests/test_util.h
similarity index 100%
rename from unit_tests/test_util.h
rename to unit_tests/tests/test_util.h