diff --git a/firmware/controllers/core/engine_ptr.h b/firmware/controllers/core/engine_ptr.h
index 28133c4e3b..68d615c4cf 100644
--- a/firmware/controllers/core/engine_ptr.h
+++ b/firmware/controllers/core/engine_ptr.h
@@ -60,6 +60,9 @@ struct persistent_config_s;
 			persistent_config_s *config = engine->config; \
 			(void)engineConfiguration; \
 			(void)config;
+
+	#define CONFIG(x) engineConfiguration->x
+	#define ENGINE(x) engine->x
 #else // EFI_UNIT_TEST
 
 	// These are the non-unit-test (AKA real firmware) noop versions
diff --git a/unit_tests/global_mocks.cpp b/unit_tests/global_mocks.cpp
index f0e0f0558d..864b7a0164 100644
--- a/unit_tests/global_mocks.cpp
+++ b/unit_tests/global_mocks.cpp
@@ -3,7 +3,6 @@
 
 #include "engine_configuration.h"
 
-#include "test_signal_executor.h"
 #include "trigger_central.h"
 #include "map_resize.h"
 #include "engine_math.h"
diff --git a/unit_tests/globalaccess.h b/unit_tests/globalaccess.h
index 381839c684..49fc668631 100644
--- a/unit_tests/globalaccess.h
+++ b/unit_tests/globalaccess.h
@@ -9,6 +9,3 @@
 
 #include "global.h"
 #include "engine_ptr.h"
-
-#define CONFIG(x) engineConfiguration->x
-#define ENGINE(x) engine->x
diff --git a/unit_tests/tests/test_signal_executor.cpp b/unit_tests/tests/test_signal_executor.cpp
index b2b38cb450..b4e6ef6bc3 100644
--- a/unit_tests/tests/test_signal_executor.cpp
+++ b/unit_tests/tests/test_signal_executor.cpp
@@ -7,7 +7,6 @@
 
 #include "global.h"
 
-#include "test_signal_executor.h"
 #include "io_pins.h"
 #include "event_queue.h"
 #include "pwm_generator_logic.h"
diff --git a/unit_tests/tests/test_signal_executor.h b/unit_tests/tests/test_signal_executor.h
deleted file mode 100644
index e38f1c9c9d..0000000000
--- a/unit_tests/tests/test_signal_executor.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * @file	test_signal_executor.h
- *
- * @date Nov 28, 2013
- * @author Andrey Belomutskiy, (c) 2012-2020
- */
-
-#pragma once
-
-int getRevolutionCounter();