diff --git a/tests/test_helpers.nim b/tests/test_helpers.nim
index a4d2fd2..8d6c5b5 100644
--- a/tests/test_helpers.nim
+++ b/tests/test_helpers.nim
@@ -2,8 +2,6 @@ import
   chronos, bearssl/rand,
   eth/[keys, p2p]
 
-import libp2p/crypto/crypto
-
 var nextPort = 30303
 
 proc localAddress*(port: int): Address =
@@ -38,7 +36,7 @@ proc getRng(): ref rand.HmacDrbgContext =
   #      purpose of the tests, it's ok as long as we only use a single thread
   {.gcsafe.}:
     if rngVar.rng.isNil:
-      rngVar.rng = crypto.newRng()
+      rngVar.rng = newRng()
     rngVar.rng
 
 template rng*(): ref rand.HmacDrbgContext =
diff --git a/tests/waku/test_rpc_waku.nim b/tests/waku/test_rpc_waku.nim
index fbef0be..36ae636 100644
--- a/tests/waku/test_rpc_waku.nim
+++ b/tests/waku/test_rpc_waku.nim
@@ -4,8 +4,8 @@ import
   std/[options, os, strutils],
   testutils/unittests, stew/byteutils, json_rpc/[rpcserver, rpcclient],
   eth/common as eth_common, eth/[keys, p2p],
-  ../../waku/v1/protocol/waku_protocol,
-  ../../waku/v1/node/rpc/[hexstrings, rpc_types, waku, key_storage]
+  ../../waku/protocol/waku_protocol,
+  ../../waku/node/rpc/[hexstrings, rpc_types, waku, key_storage]
 
 template sourceDir*: string = currentSourcePath.rsplit(DirSep, 1)[0]
 ## Generate client convenience marshalling wrappers from forward declarations
diff --git a/tests/waku/test_waku_bridge.nim b/tests/waku/test_waku_bridge.nim
index 625d076..3eb6265 100644
--- a/tests/waku/test_waku_bridge.nim
+++ b/tests/waku/test_waku_bridge.nim
@@ -12,8 +12,8 @@ import
   std/[sequtils, tables],
   chronos, testutils/unittests, eth/p2p, eth/p2p/peer_pool,
   ../../waku/whisper/whisper_protocol as whisper,
-  ../../waku/v1/protocol/waku_protocol as waku,
-  ../../waku/v1/protocol/waku_bridge,
+  ../../waku/protocol/waku_protocol as waku,
+  ../../waku/protocol/waku_bridge,
   ../test_helpers
 
 let safeTTL = 5'u32
diff --git a/tests/waku/test_waku_config.nim b/tests/waku/test_waku_config.nim
index b75baa1..ff95a35 100644
--- a/tests/waku/test_waku_config.nim
+++ b/tests/waku/test_waku_config.nim
@@ -10,7 +10,7 @@
 
 import
   std/[sequtils, options, unittest, times],
-  ../../waku/v1/protocol/waku_protocol
+  ../../waku/protocol/waku_protocol
 
 suite "Waku envelope validation":
   test "should validate and allow envelope according to config":
diff --git a/tests/waku/test_waku_connect.nim b/tests/waku/test_waku_connect.nim
index eba35c8..6d58e11 100644
--- a/tests/waku/test_waku_connect.nim
+++ b/tests/waku/test_waku_connect.nim
@@ -11,7 +11,7 @@
 import
   std/[sequtils, tables],
   chronos, testutils/unittests, eth/[keys, p2p], eth/p2p/peer_pool,
-  ../../waku/v1/protocol/waku_protocol,
+  ../../waku/protocol/waku_protocol,
   ../test_helpers
 
 const
diff --git a/tests/waku/test_waku_mail.nim b/tests/waku/test_waku_mail.nim
index 3119ba2..750c921 100644
--- a/tests/waku/test_waku_mail.nim
+++ b/tests/waku/test_waku_mail.nim
@@ -3,7 +3,7 @@
 import
   std/[tables, sequtils, times],
   chronos, testutils/unittests, eth/[p2p, async_utils], eth/p2p/peer_pool,
-  ../../waku/v1/protocol/[waku_protocol, waku_mail],
+  ../../waku/protocol/[waku_protocol, waku_mail],
   ../test_helpers
 
 const