diff --git a/unit_tests/boards.cpp b/unit_tests/boards.cpp
index 23d6e9f609..00bf69493e 100644
--- a/unit_tests/boards.cpp
+++ b/unit_tests/boards.cpp
@@ -8,17 +8,9 @@
 #include "boards.h"
 #include "engine.h"
 
-// todo: migrate to engine->engineState.mockAdcState
-float testMafValue = 0;
-
 // see setMockVoltage
 float getVoltageDivided(const char *msg, adc_channel_e hwChannel DECLARE_ENGINE_PARAMETER_SUFFIX) {
-	switch(hwChannel) {
-	case TEST_MAF_CHANNEL:
-		return testMafValue;
-	default:
-		return adcToVolts(engine->engineState.mockAdcState.getMockAdcValue(hwChannel));;
-	}
+	return adcToVolts(engine->engineState.mockAdcState.getMockAdcValue(hwChannel));;
 }
 
 float getVoltage(const char *msg, adc_channel_e hwChannel DECLARE_ENGINE_PARAMETER_SUFFIX) {
diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp
index 0b207176bc..eb2e56f986 100644
--- a/unit_tests/engine_test_helper.cpp
+++ b/unit_tests/engine_test_helper.cpp
@@ -57,7 +57,8 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType, configuration_callb
 
 	commonInitEngineController(NULL PASS_ENGINE_PARAMETER_SUFFIX);
 
-	engine->engineConfigurationPtr->mafAdcChannel = TEST_MAF_CHANNEL;
+	engineConfiguration->mafAdcChannel = EFI_ADC_10;
+	engine->engineState.mockAdcState.setMockVoltage(EFI_ADC_10, 0 PASS_ENGINE_PARAMETER_SUFFIX);
 
 	Sensor::setMockValue(SensorType::Clt, 70);
 	Sensor::setMockValue(SensorType::Iat, 30);