diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index b0918a70e0..5d7d15084d 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -425,6 +425,22 @@ void commonInitEngineController() {
 	}
 #endif
 
+#if !EFI_UNIT_TEST && EFI_ENGINE_CONTROL
+	initBenchTest();
+#endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */
+
+#if EFI_ALTERNATOR_CONTROL
+	initAlternatorCtrl();
+#endif /* EFI_ALTERNATOR_CONTROL */
+
+#if EFI_VVT_PID
+	initVvtActuators();
+#endif /* EFI_VVT_PID */
+
+#if EFI_MALFUNCTION_INDICATOR
+	initMalfunctionIndicator();
+#endif /* EFI_MALFUNCTION_INDICATOR */
+
 #if !EFI_UNIT_TEST
 	// This is tested independently - don't configure sensors for tests.
 	// This lets us selectively mock them for each test.
@@ -601,10 +617,6 @@ bool validateConfig() {
 void initEngineController() {
 	addConsoleAction("sensorinfo", printSensorInfo);
 
-#if EFI_PROD_CODE && EFI_ENGINE_CONTROL
-	initBenchTest();
-#endif /* EFI_PROD_CODE && EFI_ENGINE_CONTROL */
-
 	commonInitEngineController();
 
 #if EFI_LOGIC_ANALYZER
@@ -625,22 +637,9 @@ void initEngineController() {
 	initPwmTester();
 #endif /* EFI_PWM_TESTER */
 
-#if EFI_ALTERNATOR_CONTROL
-	initAlternatorCtrl();
-#endif /* EFI_ALTERNATOR_CONTROL */
-
-#if EFI_VVT_PID
-	initVvtActuators();
-#endif /* EFI_VVT_PID */
-
-#if EFI_MALFUNCTION_INDICATOR
-	initMalfunctionIndicator();
-#endif /* EFI_MALFUNCTION_INDICATOR */
-
 #if EFI_PROD_CODE
 	addConsoleAction("reset_accel", resetAccel);
-#endif /* EFI_PROD_CODE */
-
+#endif /* EFI_PROD_CODE *
 }
 
 /**
diff --git a/simulator/simulator/rusEfiFunctionalTest.cpp b/simulator/simulator/rusEfiFunctionalTest.cpp
index d0c0d624a8..498993f1e0 100644
--- a/simulator/simulator/rusEfiFunctionalTest.cpp
+++ b/simulator/simulator/rusEfiFunctionalTest.cpp
@@ -108,7 +108,6 @@ void rusEfiFunctionalTest(void) {
 
 	initTriggerCentral();
 	initTriggerEmulator();
-	initVvtActuators();
 
 	startStatusThreads();