diff --git a/tests/waku_store/test_client.nim b/tests/waku_store/test_client.nim
index 11554a3120..b1bfb1cb89 100644
--- a/tests/waku_store/test_client.nim
+++ b/tests/waku_store/test_client.nim
@@ -74,6 +74,14 @@ suite "Store Client":
 
     await allFutures(serverSwitch.start(), clientSwitch.start())
 
+    if serverSwitch.peerInfo.isNil():
+      error "serverSwitch.peerInfo is nil"
+      raise newException(CatchableError, "serverSwitch.peerInfo is nil")
+
+    if clientSwitch.peerInfo.isNil():
+      error "clientSwitch.peerInfo is nil"
+      raise newException(CatchableError, "clientSwitch.peerInfo is nil")
+
     serverPeerInfo = serverSwitch.peerInfo.toRemotePeerInfo()
     clientPeerInfo = clientSwitch.peerInfo.toRemotePeerInfo()
 
diff --git a/tests/waku_store_legacy/test_client.nim b/tests/waku_store_legacy/test_client.nim
index 66ff8955d4..5efef77f19 100644
--- a/tests/waku_store_legacy/test_client.nim
+++ b/tests/waku_store_legacy/test_client.nim
@@ -54,6 +54,14 @@ suite "Store Client":
 
     await allFutures(serverSwitch.start(), clientSwitch.start())
 
+    if serverSwitch.peerInfo.isNil():
+      error "serverSwitch.peerInfo is nil"
+      raise newException(CatchableError, "serverSwitch.peerInfo is nil")
+
+    if clientSwitch.peerInfo.isNil():
+      error "clientSwitch.peerInfo is nil"
+      raise newException(CatchableError, "clientSwitch.peerInfo is nil")
+
     serverPeerInfo = serverSwitch.peerInfo.toRemotePeerInfo()
     clientPeerInfo = clientSwitch.peerInfo.toRemotePeerInfo()