diff --git a/tests/node/test_wakunode_legacy_lightpush.nim b/tests/node/test_wakunode_legacy_lightpush.nim
index 4aedd7d4b..902464bcd 100644
--- a/tests/node/test_wakunode_legacy_lightpush.nim
+++ b/tests/node/test_wakunode_legacy_lightpush.nim
@@ -25,9 +25,6 @@ import
 
 suite "Waku Legacy Lightpush - End To End":
   var
-    handlerFuture {.threadvar.}: Future[(PubsubTopic, WakuMessage)]
-    handler {.threadvar.}: PushMessageHandler
-
     server {.threadvar.}: WakuNode
     client {.threadvar.}: WakuNode
 
@@ -37,13 +34,6 @@ suite "Waku Legacy Lightpush - End To End":
     message {.threadvar.}: WakuMessage
 
   asyncSetup:
-    handlerFuture = newPushHandlerFuture()
-    handler = proc(
-        peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
-    ): Future[WakuLightPushResult[void]] {.async.} =
-      handlerFuture.complete((pubsubTopic, message))
-      return ok()
-
     let
       serverKey = generateSecp256k1Key()
       clientKey = generateSecp256k1Key()
@@ -108,9 +98,6 @@ suite "Waku Legacy Lightpush - End To End":
 
 suite "RLN Proofs as a Lightpush Service":
   var
-    handlerFuture {.threadvar.}: Future[(PubsubTopic, WakuMessage)]
-    handler {.threadvar.}: PushMessageHandler
-
     server {.threadvar.}: WakuNode
     client {.threadvar.}: WakuNode
     anvilProc {.threadvar.}: Process
@@ -122,13 +109,6 @@ suite "RLN Proofs as a Lightpush Service":
     message {.threadvar.}: WakuMessage
 
   asyncSetup:
-    handlerFuture = newPushHandlerFuture()
-    handler = proc(
-        peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
-    ): Future[WakuLightPushResult[void]] {.async.} =
-      handlerFuture.complete((pubsubTopic, message))
-      return ok()
-
     let
       serverKey = generateSecp256k1Key()
       clientKey = generateSecp256k1Key()
diff --git a/tests/node/test_wakunode_lightpush.nim b/tests/node/test_wakunode_lightpush.nim
index 7b4da6d4c..66b87b85e 100644
--- a/tests/node/test_wakunode_lightpush.nim
+++ b/tests/node/test_wakunode_lightpush.nim
@@ -37,13 +37,6 @@ suite "Waku Lightpush - End To End":
     message {.threadvar.}: WakuMessage
 
   asyncSetup:
-    handlerFuture = newPushHandlerFuture()
-    handler = proc(
-        peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
-    ): Future[WakuLightPushResult] {.async.} =
-      handlerFuture.complete((pubsubTopic, message))
-      return ok(PublishedToOnePeer)
-
     let
       serverKey = generateSecp256k1Key()
       clientKey = generateSecp256k1Key()
@@ -108,9 +101,6 @@ suite "Waku Lightpush - End To End":
 
 suite "RLN Proofs as a Lightpush Service":
   var
-    handlerFuture {.threadvar.}: Future[(PubsubTopic, WakuMessage)]
-    handler {.threadvar.}: PushMessageHandler
-
     server {.threadvar.}: WakuNode
     client {.threadvar.}: WakuNode
     anvilProc {.threadvar.}: Process
@@ -122,13 +112,6 @@ suite "RLN Proofs as a Lightpush Service":
     message {.threadvar.}: WakuMessage
 
   asyncSetup:
-    handlerFuture = newPushHandlerFuture()
-    handler = proc(
-        peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
-    ): Future[WakuLightPushResult] {.async.} =
-      handlerFuture.complete((pubsubTopic, message))
-      return ok(PublishedToOnePeer)
-
     let
       serverKey = generateSecp256k1Key()
       clientKey = generateSecp256k1Key()
diff --git a/tests/waku_lightpush/test_client.nim b/tests/waku_lightpush/test_client.nim
index af22ffa5d..0bc9afdd4 100644
--- a/tests/waku_lightpush/test_client.nim
+++ b/tests/waku_lightpush/test_client.nim
@@ -38,7 +38,7 @@ suite "Waku Lightpush Client":
   asyncSetup:
     handlerFuture = newPushHandlerFuture()
     handler = proc(
-        peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
+        pubsubTopic: PubsubTopic, message: WakuMessage
     ): Future[WakuLightPushResult] {.async.} =
       let msgLen = message.encode().buffer.len
       if msgLen > int(DefaultMaxWakuMessageSize) + 64 * 1024:
@@ -287,7 +287,7 @@ suite "Waku Lightpush Client":
         handlerError = "handler-error"
         handlerFuture2 = newFuture[void]()
         handler2 = proc(
-            peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
+            pubsubTopic: PubsubTopic, message: WakuMessage
         ): Future[WakuLightPushResult] {.async.} =
           handlerFuture2.complete()
           return lighpushErrorResult(LightPushErrorCode.PAYLOAD_TOO_LARGE, handlerError)
diff --git a/tests/waku_lightpush/test_ratelimit.nim b/tests/waku_lightpush/test_ratelimit.nim
index bdab3f074..e023bf3f5 100644
--- a/tests/waku_lightpush/test_ratelimit.nim
+++ b/tests/waku_lightpush/test_ratelimit.nim
@@ -19,7 +19,7 @@ suite "Rate limited push service":
     ## Given
     var handlerFuture = newFuture[(string, WakuMessage)]()
     let handler: PushMessageHandler = proc(
-        peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
+        pubsubTopic: PubsubTopic, message: WakuMessage
     ): Future[WakuLightPushResult] {.async.} =
       handlerFuture.complete((pubsubTopic, message))
       return lightpushSuccessResult(1) # succeed to publish to 1 peer.
@@ -84,7 +84,7 @@ suite "Rate limited push service":
     # CI can be slow enough that sequential requests accidentally refill tokens.
     # Instead we issue a small burst and assert we observe at least one rejection.
     let handler = proc(
-        peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
+        pubsubTopic: PubsubTopic, message: WakuMessage
     ): Future[WakuLightPushResult] {.async.} =
       return lightpushSuccessResult(1)
 
@@ -122,9 +122,8 @@ suite "Rate limited push service":
 
     # ensure period of time has passed and the client can again use the service
     await sleepAsync(tokenPeriod + 100.millis)
-    let recoveryRes = await client.publish(
-      some(DefaultPubsubTopic), fakeWakuMessage(), serverPeerId
-    )
+    let recoveryRes =
+      await client.publish(some(DefaultPubsubTopic), fakeWakuMessage(), serverPeerId)
     check recoveryRes.isOk()
 
     ## Cleanup
diff --git a/tests/waku_lightpush_legacy/test_client.nim b/tests/waku_lightpush_legacy/test_client.nim
index 1dcb466c9..3d3027e9c 100644
--- a/tests/waku_lightpush_legacy/test_client.nim
+++ b/tests/waku_lightpush_legacy/test_client.nim
@@ -35,7 +35,7 @@ suite "Waku Legacy Lightpush Client":
   asyncSetup:
     handlerFuture = newPushHandlerFuture()
     handler = proc(
-        peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
+        pubsubTopic: PubsubTopic, message: WakuMessage
     ): Future[WakuLightPushResult[void]] {.async.} =
       let msgLen = message.encode().buffer.len
       if msgLen > int(DefaultMaxWakuMessageSize) + 64 * 1024:
@@ -282,7 +282,7 @@ suite "Waku Legacy Lightpush Client":
         handlerError = "handler-error"
         handlerFuture2 = newFuture[void]()
         handler2 = proc(
-            peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
+            pubsubTopic: PubsubTopic, message: WakuMessage
         ): Future[WakuLightPushResult[void]] {.async.} =
           handlerFuture2.complete()
           return err(handlerError)
diff --git a/tests/waku_lightpush_legacy/test_ratelimit.nim b/tests/waku_lightpush_legacy/test_ratelimit.nim
index 37c43a066..ae5f5ed28 100644
--- a/tests/waku_lightpush_legacy/test_ratelimit.nim
+++ b/tests/waku_lightpush_legacy/test_ratelimit.nim
@@ -25,7 +25,7 @@ suite "Rate limited push service":
     ## Given
     var handlerFuture = newFuture[(string, WakuMessage)]()
     let handler: PushMessageHandler = proc(
-        peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
+        pubsubTopic: PubsubTopic, message: WakuMessage
     ): Future[WakuLightPushResult[void]] {.async.} =
       handlerFuture.complete((pubsubTopic, message))
       return ok()
@@ -87,7 +87,7 @@ suite "Rate limited push service":
 
     ## Given
     let handler = proc(
-        peer: PeerId, pubsubTopic: PubsubTopic, message: WakuMessage
+        pubsubTopic: PubsubTopic, message: WakuMessage
     ): Future[WakuLightPushResult[void]] {.async.} =
       return ok()