diff --git a/firmware/controllers/actuators/boost_control.cpp b/firmware/controllers/actuators/boost_control.cpp
index 529b596164..fd1822b1ac 100644
--- a/firmware/controllers/actuators/boost_control.cpp
+++ b/firmware/controllers/actuators/boost_control.cpp
@@ -37,7 +37,7 @@ static Logging *logger;
 static boostOpenLoop_Map3D_t boostMapOpen("boostmapopen", 1);
 static boostOpenLoop_Map3D_t boostMapClosed("boostmapclosed", 1);
 static SimplePwm boostPwmControl("boost");
-static Pid boostControlPid(&persistentState.persistentConfiguration.engineConfiguration.boostPid);
+static Pid boostControlPid;
 
 static bool shouldResetPid = false;
 
@@ -50,6 +50,8 @@ static void pidReset(void) {
 }
 
 class BoostControl: public PeriodicTimerController {
+	DECLARE_ENGINE_PTR;
+
 	int getPeriodMs() override {
 		return GET_PERIOD_LIMITED(&engineConfiguration->boostPid);
 	}
@@ -100,10 +102,10 @@ class BoostControl: public PeriodicTimerController {
 
 static BoostControl BoostController;
 
+#if !EFI_UNIT_TEST
 void setBoostPFactor(float value) {
 	engineConfiguration->boostPid.pFactor = value;
 	boostControlPid.reset();
-
 }
 
 void setBoostIFactor(float value) {
@@ -115,6 +117,7 @@ void setBoostDFactor(float value) {
 	engineConfiguration->boostPid.dFactor = value;
 	boostControlPid.reset();
 }
+#endif /* EFI_UNIT_TEST */
 
 void setDefaultBoostParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	engineConfiguration->isBoostControlEnabled = true;
@@ -145,6 +148,7 @@ void setDefaultBoostParameters(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 }
 
 static void turnBoostPidOn() {
+#if !EFI_UNIT_TEST
 	if (CONFIG(boostControlPin) == GPIO_UNASSIGNED){
 		return;
 	}
@@ -159,6 +163,7 @@ static void turnBoostPidOn() {
 		0.5f,
 		(pwm_gen_callback*) applyPinState
 	);
+#endif /* EFI_UNIT_TEST */
 }
 
 void startBoostPin(void) {
@@ -174,16 +179,20 @@ void onConfigurationChangeBoostCallback(engine_configuration_s *previousConfigur
 }
 
 void initBoostCtrl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
+#if !EFI_UNIT_TEST
 	if (CONFIG(boostControlPin) == GPIO_UNASSIGNED){
 		return;
 	}
 
+	boostControlPid.initPidClass(&persistentState.persistentConfiguration.engineConfiguration.boostPid);
+
 	logger = sharedLogger;
 	boostMapOpen.init(config->boostTableOpenLoop, config->boostMapBins, config->boostRpmBins);
 	boostMapClosed.init(config->boostTableClosedLoop, config->boostTpsBins, config->boostRpmBins);
 	boostControlPid.reset();
 	startBoostPin();
 	BoostController.Start();
+#endif
 }
 
 #endif