diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp
index f66b0d6ac0..5507197c74 100644
--- a/firmware/controllers/algo/defaults/default_base_engine.cpp
+++ b/firmware/controllers/algo/defaults/default_base_engine.cpp
@@ -43,13 +43,13 @@ static void setDefaultHPFP() {
 // todo: would be nice for unit tests to be happy about these defaults
 #if EFI_PROD_CODE
 	engineConfiguration->hpfpPumpVolume = 0.290;
+#endif
 	engineConfiguration->hpfpMinAngle = 10;
 	engineConfiguration->hpfpActivationAngle = 30;
 	engineConfiguration->hpfpTargetDecay = 2000;
 	engineConfiguration->hpfpPidP = 0.01;
 	engineConfiguration->hpfpPidI = 0.0003;
 	engineConfiguration->hpfpPeakPos = 10;
-#endif
 }
 
 void setDefaultBaseEngine() {
diff --git a/unit_tests/tests/test_hpfp.cpp b/unit_tests/tests/test_hpfp.cpp
index bd3b6f92ca..7d7afa45e7 100755
--- a/unit_tests/tests/test_hpfp.cpp
+++ b/unit_tests/tests/test_hpfp.cpp
@@ -106,6 +106,11 @@ TEST(HPFP, InjectionReplacementFuel) {
 TEST(HPFP, PI) {
 	EngineTestHelper eth(engine_type_e::TEST_ENGINE);
 
+	engineConfiguration->hpfpTargetDecay = 0;
+	engineConfiguration->hpfpPidP = 0;
+	engineConfiguration->hpfpPidI = 0;
+	engineConfiguration->hpfpPeakPos = 0;
+
 	engineConfiguration->cylindersCount = 4;
 	engineConfiguration->hpfpCamLobes = 4;
 	engine->engineState.injectionMass[0] = 0.05 /* cc/cyl */ * fuelDensity;
@@ -163,6 +168,11 @@ TEST(HPFP, PI) {
 TEST(HPFP, Angle) {
 	EngineTestHelper eth(engine_type_e::TEST_ENGINE);
 
+	engineConfiguration->hpfpTargetDecay = 0;
+	engineConfiguration->hpfpPidP = 0;
+	engineConfiguration->hpfpPidI = 0;
+	engineConfiguration->hpfpPeakPos = 0;
+
 	engineConfiguration->cylindersCount = 4;
 	engineConfiguration->hpfpCamLobes = 4;
 	engine->engineState.injectionMass[0] = 0.05 /* cc/cyl */ * fuelDensity;