diff --git a/unit_tests/tests/test_aux_valves.cpp b/unit_tests/tests/test_aux_valves.cpp
index e67251bbac..a4466af59c 100644
--- a/unit_tests/tests/test_aux_valves.cpp
+++ b/unit_tests/tests/test_aux_valves.cpp
@@ -20,7 +20,7 @@ TEST(misc, testAuxValves) {
 	engineConfiguration->isInjectionEnabled = false;
 
 	eth.fireTriggerEvents2(2 /* count */ , 600 /* ms */);
-	ASSERT_EQ( 100,  GET_RPM()) << "spinning-RPM#1";
+	ASSERT_EQ( 100,  round(Sensor::getOrZero(SensorType::Rpm))) << "spinning-RPM#1";
 
 	eth.assertTriggerEvent("a0", 0, &engine->auxValves[0][0].open, (void*)&auxPlainPinTurnOn, 7, 86);
 	eth.assertTriggerEvent("a1", 1, &engine->auxValves[0][1].open, (void*)&auxPlainPinTurnOn, 3, 86);
diff --git a/unit_tests/tests/test_hpfp_integrated.cpp b/unit_tests/tests/test_hpfp_integrated.cpp
index e40168e350..2bb160ac0b 100644
--- a/unit_tests/tests/test_hpfp_integrated.cpp
+++ b/unit_tests/tests/test_hpfp_integrated.cpp
@@ -25,7 +25,7 @@ TEST(HPFP, IntegratedSchedule) {
 
 
 	eth.smartFireTriggerEvents2(/*count*/40, /*delay*/ 4);
-	ASSERT_EQ(937, GET_RPM());
+	ASSERT_EQ(937, round(Sensor::getOrZero(SensorType::Rpm)));
 
 	for (int i = 0;i<100;i++) {
 		eth.smartFireTriggerEvents2(/*count*/1, /*delay*/ 4);