diff --git a/src/util/time.cpp b/src/util/time.cpp
index 14183d540d..fa0ad5b5a4 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -21,7 +21,7 @@
 
 void UninterruptibleSleep(const std::chrono::microseconds& n) { std::this_thread::sleep_for(n); }
 
-static std::atomic<int64_t> nMockTime(0); //!< For testing
+static std::atomic<std::chrono::seconds> g_mock_time{}; //!< For testing
 
 bool ChronoSanityCheck()
 {
@@ -69,7 +69,7 @@ bool ChronoSanityCheck()
 template <typename T>
 T GetTime()
 {
-    const std::chrono::seconds mocktime{nMockTime.load(std::memory_order_relaxed)};
+    const auto mocktime{g_mock_time.load(std::memory_order_relaxed)};
     const auto ret{
         mocktime.count() ?
             mocktime :
@@ -89,20 +89,16 @@ static T GetSystemTime()
     return now;
 }
 
-void SetMockTime(int64_t nMockTimeIn)
-{
-    Assert(nMockTimeIn >= 0);
-    nMockTime.store(nMockTimeIn, std::memory_order_relaxed);
-}
-
+void SetMockTime(int64_t nMockTimeIn) { SetMockTime(std::chrono::seconds{nMockTimeIn}); }
 void SetMockTime(std::chrono::seconds mock_time_in)
 {
-    nMockTime.store(mock_time_in.count(), std::memory_order_relaxed);
+    Assert(mock_time_in >= 0s);
+    g_mock_time.store(mock_time_in, std::memory_order_relaxed);
 }
 
 std::chrono::seconds GetMockTime()
 {
-    return std::chrono::seconds(nMockTime.load(std::memory_order_relaxed));
+    return g_mock_time.load(std::memory_order_relaxed);
 }
 
 int64_t GetTimeMillis()