diff --git a/mock/lib-time-mocks.cpp b/mock/lib-time-mocks.cpp
index 06b2ef0..7a8f9da 100644
--- a/mock/lib-time-mocks.cpp
+++ b/mock/lib-time-mocks.cpp
@@ -1,23 +1,27 @@
 #include <rusefi/rusefi_time_math.h>
 
-static int timeNowUs = 0;
+static efitick_t timeNowNt = 0;
+
+efitick_t getTimeNowNt() {
+	return timeNowNt;
+}
 
 efitimeus_t getTimeNowUs() {
-	return timeNowUs;
+	return NT2US(getTimeNowNt());
 }
 
 efitimesec_t getTimeNowS() {
 	return getTimeNowUs() / 1000 / 1000;
 }
 
-efitick_t getTimeNowNt() {
-	return getTimeNowUs() * US_TO_NT_MULTIPLIER;
+void setTimeNowNt(efitick_t nt) {
+	timeNowNt = nt;
 }
 
 void setTimeNowUs(int us) {
-	timeNowUs = us;
+	setTimeNowNt(USF2NT((efitick_t)us));
 }
 
 void advanceTimeUs(int us) {
-	timeNowUs += us;
+	timeNowNt += USF2NT((efitick_t)us);
 }
diff --git a/util/include/rusefi/rusefi_time_math.h b/util/include/rusefi/rusefi_time_math.h
index 81ea802..f42838a 100644
--- a/util/include/rusefi/rusefi_time_math.h
+++ b/util/include/rusefi/rusefi_time_math.h
@@ -17,6 +17,7 @@
 
 #if EFI_UNIT_TEST
 // In unit tests, we can time travel...
+void setTimeNowNt(efitick_t nt);
 void setTimeNowUs(int us);
 void advanceTimeUs(int us);
 #endif