diff --git a/tests/v2/test_pagination_utils.nim b/tests/v2/test_pagination_utils.nim
index 0eb72915fa..b4360805c6 100644
--- a/tests/v2/test_pagination_utils.nim
+++ b/tests/v2/test_pagination_utils.nim
@@ -5,7 +5,7 @@ import
   chronos,
   stew/byteutils,
   libp2p/crypto/crypto,
-  ../../waku/v2/utils/pagination
+  ../../waku/v2/utils/pagination,
   ../../waku/v2/utils/time
 
 procSuite "Pagination utils":
diff --git a/tests/v2/test_waku_store_queue.nim b/tests/v2/test_waku_store_queue.nim
index 20181322c1..224d7fc7b4 100644
--- a/tests/v2/test_waku_store_queue.nim
+++ b/tests/v2/test_waku_store_queue.nim
@@ -92,7 +92,7 @@ procSuite "Sorted store queue":
       # First page
       pInfo.pageSize == 3
       pInfo.direction == PagingDirection.FORWARD
-      pInfo.cursor.senderTime == 3.0
+      pInfo.cursor.senderTime == Timestamp(3)
       err == HistoryResponseError.NONE
       res.mapIt(it.timestamp.int) == @[1,2,3]
 
@@ -106,7 +106,7 @@ procSuite "Sorted store queue":
       pInfo.direction == PagingDirection.FORWARD
       pInfo.cursor.senderTime == Timestamp(5)
       err == HistoryResponseError.NONE
-      res.mapIt(it.timestamp.int64) == @[4,5]
+      res.mapIt(it.timestamp.int) == @[4,5]
     
     (res, pInfo, err) = testStoreQueue.getPage(predicate,
                                                pInfo)
@@ -132,7 +132,7 @@ procSuite "Sorted store queue":
       pInfo.direction == PagingDirection.BACKWARD
       pInfo.cursor.senderTime == Timestamp(3)
       err == HistoryResponseError.NONE
-      res.mapIt(it.timestamp.int64) == @[3,4,5]
+      res.mapIt(it.timestamp.int) == @[3,4,5]
 
 
     (res, pInfo, err) = testStoreQueue.getPage(predicate,
@@ -144,7 +144,7 @@ procSuite "Sorted store queue":
       pInfo.direction == PagingDirection.BACKWARD
       pInfo.cursor.senderTime == Timestamp(1)
       err == HistoryResponseError.NONE
-      res.mapIt(it.timestamp.int64) == @[1,2]
+      res.mapIt(it.timestamp.int) == @[1,2]
     
     (res, pInfo, err) = testStoreQueue.getPage(predicate,
                                                pInfo)
@@ -173,7 +173,7 @@ procSuite "Sorted store queue":
       pInfo.direction == PagingDirection.FORWARD
       pInfo.cursor.senderTime == Timestamp(4)
       err == HistoryResponseError.NONE
-      res.mapIt(it.timestamp.int64) == @[2,4]
+      res.mapIt(it.timestamp.int) == @[2,4]
     
     (res, pInfo, err) = testStoreQueue.getPage(onlyEvenTimes,
                                                pInfo)
@@ -198,7 +198,7 @@ procSuite "Sorted store queue":
       pInfo.direction == PagingDirection.BACKWARD
       pInfo.cursor.senderTime == Timestamp(3)
       err == HistoryResponseError.NONE
-      res.mapIt(it.timestamp.int64) == @[3,5]
+      res.mapIt(it.timestamp.int) == @[3,5]
     
     (res, pInfo, err) = testStoreQueue.getPage(onlyOddTimes,
                                                pInfo)
@@ -209,7 +209,7 @@ procSuite "Sorted store queue":
       pInfo.direction == PagingDirection.BACKWARD
       pInfo.cursor.senderTime == Timestamp(1)
       err == HistoryResponseError.NONE
-      res.mapIt(it.timestamp.int64) == @[1]
+      res.mapIt(it.timestamp.int) == @[1]
 
     (res, pInfo, err) = testStoreQueue.getPage(onlyOddTimes,
                                                pInfo)