diff --git a/fluffy/tests/all_fluffy_tests.nim b/fluffy/tests/all_fluffy_tests.nim
index 169a333ea..0f22c5e69 100644
--- a/fluffy/tests/all_fluffy_tests.nim
+++ b/fluffy/tests/all_fluffy_tests.nim
@@ -5,8 +5,6 @@
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-import ../../test_macro
-
 {. warning[UnusedImport]:off .}
 
 import
@@ -14,8 +12,5 @@ import
   ./test_portal,
   ./test_content_network,
   ./test_discovery_rpc,
-  ./test_custom_distance
-
-cliBuilder:
-  import
-    ./test_bridge_parser
+  ./test_custom_distance,
+  ./test_bridge_parser
diff --git a/fluffy/tests/test_custom_distance.nim b/fluffy/tests/test_custom_distance.nim
index 66874a5b3..ee92a1eaf 100644
--- a/fluffy/tests/test_custom_distance.nim
+++ b/fluffy/tests/test_custom_distance.nim
@@ -8,11 +8,10 @@
 {.used.}
 
 import
-  std/[unittest, sequtils],
-  stint,
+  std/sequtils,
+  stint, unittest2,
   ../network/state/custom_distance
 
-
 suite "State network custom distance function":
   test "Calculate distance according to spec":
     check:
@@ -56,4 +55,3 @@ suite "State network custom distance function":
 
     check:
       logDistances == logCalculated
-
diff --git a/fluffy/tests/test_portal_encoding.nim b/fluffy/tests/test_portal_encoding.nim
index 9048b1c8d..67389099d 100644
--- a/fluffy/tests/test_portal_encoding.nim
+++ b/fluffy/tests/test_portal_encoding.nim
@@ -8,8 +8,7 @@
 {.used.}
 
 import
-  std/unittest,
-  stint, stew/[byteutils, results], eth/p2p/discoveryv5/enr,
+  unittest2, stint, stew/[byteutils, results], eth/p2p/discoveryv5/enr,
   ../network/state/messages
 
 suite "Portal Protocol Message Encodings":