diff --git a/tests/v2/standard_setup.nim b/tests/v2/standard_setup.nim
index dc0bcdab8..abbea915c 100644
--- a/tests/v2/standard_setup.nim
+++ b/tests/v2/standard_setup.nim
@@ -44,8 +44,8 @@ proc newStandardSwitch*(privKey = none(PrivateKey),
                  # XXX: Hacky test, hijacking WakuSub here
                  # XXX: If I use WakuSub here I get a SIGSERV
                  #echo "Using WakuSub here"
-                 PubSub newPubSub(FloodSub, peerInfo, triggerSelf)
-                 #PubSub newPubSub(WakuSub, peerInfo, triggerSelf)
+                 #PubSub newPubSub(FloodSub, peerInfo, triggerSelf)
+                 PubSub newPubSub(WakuSub, peerInfo, triggerSelf)
 
   result = newSwitch(peerInfo,
                      transports,
diff --git a/tests/v2/test_waku.nim b/tests/v2/test_waku.nim
index c5870dd40..3f5f28d9e 100644
--- a/tests/v2/test_waku.nim
+++ b/tests/v2/test_waku.nim
@@ -29,7 +29,8 @@ proc waitSub(sender, receiver: auto; key: string) {.async, gcsafe.} =
   # turn things deterministic
   # this is for testing purposes only
   var ceil = 15
-  let fsub = cast[FloodSub](sender.pubSub.get())
+  #echo "isa thing", repr(sender.pubSub.get())
+  let fsub = cast[WakuSub](sender.pubSub.get())
   while not fsub.floodsub.hasKey(key) or
         not fsub.floodsub[key].contains(receiver.peerInfo.id):
     await sleepAsync(100.millis)