diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/TriggerMetaGenerator.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/TriggerMetaGenerator.java
index c5ce8d4a0b..f8c4d976c1 100644
--- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/TriggerMetaGenerator.java
+++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/TriggerMetaGenerator.java
@@ -6,7 +6,7 @@ public class TriggerMetaGenerator {
     public static void main(String[] a) throws IOException {
         ReaderStateImpl reader = new ReaderStateImpl();
         reader.setDefinitionInputFile("integration/rusefi_config_trigger.txt");
-        reader.addCHeaderDestination("../unit_tests/trigger_meta_generated.h");
+        reader.addCHeaderDestination("../unit_tests/test-framework/trigger_meta_generated.h");
         reader.addJavaDestination("../java_tools/trigger-image/src/main/java/com/rusefi/config/generated/TriggerMeta.java");
 
         reader.doJob();
diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index cd4e275d96..7d390bf9a1 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -49,6 +49,7 @@ INCDIR += \
 	$(UNIT_TESTS_DIR) \
 	$(ALLINC) \
 	$(PROJECT_DIR)/config/boards/hellen \
+	$(FRAMEWORK_INC) \
 	$(UNIT_TESTS_DIR)/test_data_structures \
 	$(UNIT_TESTS_DIR)/chibios-mock \
 	$(UNIT_TESTS_DIR)/native \
diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/test-framework/engine_test_helper.cpp
similarity index 100%
rename from unit_tests/engine_test_helper.cpp
rename to unit_tests/test-framework/engine_test_helper.cpp
diff --git a/unit_tests/engine_test_helper.h b/unit_tests/test-framework/engine_test_helper.h
similarity index 100%
rename from unit_tests/engine_test_helper.h
rename to unit_tests/test-framework/engine_test_helper.h
diff --git a/unit_tests/global_execution_queue.cpp b/unit_tests/test-framework/global_execution_queue.cpp
similarity index 100%
rename from unit_tests/global_execution_queue.cpp
rename to unit_tests/test-framework/global_execution_queue.cpp
diff --git a/unit_tests/global_execution_queue.h b/unit_tests/test-framework/global_execution_queue.h
similarity index 100%
rename from unit_tests/global_execution_queue.h
rename to unit_tests/test-framework/global_execution_queue.h
diff --git a/unit_tests/logicdata_csv_reader.cpp b/unit_tests/test-framework/logicdata_csv_reader.cpp
similarity index 100%
rename from unit_tests/logicdata_csv_reader.cpp
rename to unit_tests/test-framework/logicdata_csv_reader.cpp
diff --git a/unit_tests/logicdata_csv_reader.h b/unit_tests/test-framework/logicdata_csv_reader.h
similarity index 100%
rename from unit_tests/logicdata_csv_reader.h
rename to unit_tests/test-framework/logicdata_csv_reader.h
diff --git a/unit_tests/trigger_meta_generated.h b/unit_tests/test-framework/trigger_meta_generated.h
similarity index 100%
rename from unit_tests/trigger_meta_generated.h
rename to unit_tests/test-framework/trigger_meta_generated.h
diff --git a/unit_tests/unit_test_framework.cpp b/unit_tests/test-framework/unit_test_framework.cpp
similarity index 100%
rename from unit_tests/unit_test_framework.cpp
rename to unit_tests/test-framework/unit_test_framework.cpp
diff --git a/unit_tests/unit_test_framework.h b/unit_tests/test-framework/unit_test_framework.h
similarity index 100%
rename from unit_tests/unit_test_framework.h
rename to unit_tests/test-framework/unit_test_framework.h
diff --git a/unit_tests/test.mk b/unit_tests/test.mk
index ca3395a7cc..03973099eb 100644
--- a/unit_tests/test.mk
+++ b/unit_tests/test.mk
@@ -1,8 +1,9 @@
-FRAMEWORK_SRC_CPP = unit_test_framework.cpp \
-	engine_test_helper.cpp \
-	logicdata_csv_reader.cpp \
+FRAMEWORK_SRC_CPP = test-framework/unit_test_framework.cpp \
+	test-framework/engine_test_helper.cpp \
+	test-framework/logicdata_csv_reader.cpp \
 	boards.cpp \
-	global_execution_queue.cpp \
+	test-framework/global_execution_queue.cpp \
 	test_basic_math/test_find_index.cpp \
 	test_basic_math/test_interpolation_3d.cpp \
 
+FRAMEWORK_INC = test-framework
\ No newline at end of file