diff --git a/Makefile b/Makefile
index b5a26f71f..db9a3c27b 100644
--- a/Makefile
+++ b/Makefile
@@ -131,12 +131,22 @@ clean-librln:
 clean: | clean-librln
 
 
+#################
+## Waku Common ##
+#################
+.PHONY: testcommon
+
+testcommon: | build deps
+	echo -e $(BUILD_MSG) "build/$@" && \
+		$(ENV_SCRIPT) nim testcommon $(NIM_PARAMS) waku.nims
+
+
 #############
 ## Waku v2 ##
 #############
 .PHONY: test2 wakunode2 example2 sim2 scripts2 wakubridge chat2 chat2bridge
 
-test2: | build deps librln
+test2: | build deps librln testcommon
 	echo -e $(BUILD_MSG) "build/$@" && \
 		$(ENV_SCRIPT) nim test2 $(NIM_PARAMS) $(EXPERIMENTAL_PARAMS) waku.nims
 
@@ -190,11 +200,11 @@ networkmonitor: | build deps
 #################
 .PHONY: testwhisper test1 wakunode1 example1 sim1
 
-testwhisper: | build deps
+testwhisper: | build deps testcommon
 	echo -e $(BUILD_MSG) "build/$@" && \
 		$(ENV_SCRIPT) nim testwhisper $(NIM_PARAMS) waku.nims
 
-test1: | build deps
+test1: | build deps testcommon
 	echo -e $(BUILD_MSG) "build/$@" && \
 		$(ENV_SCRIPT) nim test1 $(NIM_PARAMS) waku.nims
 
diff --git a/tests/all_tests_v2.nim b/tests/all_tests_v2.nim
index 0ef96fda8..5ae3c5f1b 100644
--- a/tests/all_tests_v2.nim
+++ b/tests/all_tests_v2.nim
@@ -1,9 +1,3 @@
-## Common
-
-# Waku common test suite
-import ./all_tests_common
-
-
 ## Waku v2
 
 # Waku message test suite
diff --git a/waku.nimble b/waku.nimble
index 619212830..a391b120e 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -41,11 +41,16 @@ proc test(name: string, params = "-d:chronicles_log_level=DEBUG", lang = "c") =
   buildBinary name, "tests/", params
   exec "build/" & name
 
-### Whisper tasks
+
+### Waku common tasks
+task testcommon, "Build & run common tests":
+  test "all_tests_common", "-d:chronicles_log_level=WARN -d:chronosStrictException"
+
+
+### Whisper & Waku v1 tasks
 task testwhisper, "Build & run Whisper tests":
   test "all_tests_whisper", "-d:chronicles_log_level=WARN -d:chronosStrictException"
 
-### Waku v1 tasks
 task wakunode1, "Build Waku v1 cli node":
   buildBinary "wakunode1", "waku/v1/node/",
     "-d:chronicles_log_level=DEBUG -d:chronosStrictException"
@@ -63,6 +68,7 @@ task example1, "Build Waku v1 example":
 task test1, "Build & run Waku v1 tests":
   test "all_tests_v1", "-d:chronicles_log_level=WARN -d:chronosStrictException"
 
+
 ### Waku v2 tasks
 task wakunode2, "Build Waku v2 (experimental) cli node":
   let name = "wakunode2"
diff --git a/waku/common/envvar_serialization/utils.nim b/waku/common/envvar_serialization/utils.nim
index fee6ece4f..9129a826d 100644
--- a/waku/common/envvar_serialization/utils.nim
+++ b/waku/common/envvar_serialization/utils.nim
@@ -3,11 +3,10 @@ when (NimMajor, NimMinor) < (1, 4):
 else:
   {.push raises: [].}
 
-
 import
   std/[os, strutils],
-  stew/byteutils, 
-  stew/ranges/ptr_arith
+  stew/byteutils,
+  stew/ptrops
 
 
 type