diff --git a/index.js b/index.js
index b0cc153..aeb34aa 100644
--- a/index.js
+++ b/index.js
@@ -66,7 +66,7 @@ export default function runAll(nodes) {
       await Promise.all(promises);
       // All connected and relay ready
 
-      const contentTopic = "/js-waku-testing/1/relay-test/utf8";
+      const contentTopic = `/waku-tests/1/relay-test-${id}/utf8`;
 
       const messages = [];
 
@@ -85,7 +85,7 @@ export default function runAll(nodes) {
 
       const relayPromises = wakus.map(async (waku, i) => {
         const msg = await WakuMessage.fromUtf8String(
-          `sent from ${i} - ${id}`,
+          `sent via ${nodes[i]} - ${id}`,
           contentTopic
         );
         return waku.relay.send(msg);
@@ -104,7 +104,7 @@ export default function runAll(nodes) {
       expect(messages.length).to.gte(nodes.length);
 
       for (let i = 0; i < wakus.length; i++) {
-        expect(messages.map((m) => m.msg)).to.contain(`sent from ${i} - ${id}`);
+        expect(messages.map((m) => m.msg)).to.contain(`sent via ${nodes[i]} - ${id}`);
       }
     });
 
@@ -129,7 +129,7 @@ export default function runAll(nodes) {
       await Promise.all(promises);
       // All connected and relay ready
 
-      const contentTopic = "/js-waku-testing/1/relay-test/utf8";
+      const contentTopic = `/waku-tests/1/light-push-${id}/utf8`;
 
       const messages = [];
 
@@ -148,7 +148,7 @@ export default function runAll(nodes) {
 
       const relayPromises = wakus.map(async (waku, i) => {
         const msg = await WakuMessage.fromUtf8String(
-          `sent from ${i} - ${id}`,
+          `sent via ${nodes[i]} - ${id}`,
           contentTopic
         );
         return waku.lightPush.push(msg);
@@ -166,7 +166,7 @@ export default function runAll(nodes) {
       expect(messages.length).to.gte(nodes.length);
 
       for (let i = 0; i < wakus.length; i++) {
-        expect(messages.map((m) => m.msg)).to.contain(`sent from ${i} - ${id}`);
+        expect(messages.map((m) => m.msg)).to.contain(`sent via ${nodes[i]} - ${id}`);
       }
     });
 
@@ -191,11 +191,11 @@ export default function runAll(nodes) {
       await Promise.all(promises);
       // All connected and relay ready
 
-      const contentTopic = "/js-waku-testing/1/store-test/utf8";
+      const contentTopic = `/waku-tests/1/store-test-${id}/utf8`;
 
       const relayPromises = wakus.map(async (waku, i) => {
         const msg = await WakuMessage.fromUtf8String(
-          `sent from ${i} - ${id}`,
+          `sent via ${nodes[i]} - ${id}`,
           contentTopic
         );
         return waku.relay.send(msg);
@@ -210,7 +210,7 @@ export default function runAll(nodes) {
         console.log(index, payloads);
 
         for (let i = 0; i < wakus.length; i++) {
-          expect(payloads).to.contain(`sent from ${i} - ${id}`);
+          expect(payloads).to.contain(`sent via ${nodes[i]} - ${id}`);
         }
       });
 
diff --git a/nativeWssProdFleet.js b/nativeWssProdFleet.js
new file mode 100644
index 0000000..3bf8a8a
--- /dev/null
+++ b/nativeWssProdFleet.js
@@ -0,0 +1,12 @@
+import { describe } from "mocha";
+import runAll from "./index.js";
+
+const nodes = [
+  "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
+  "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
+  "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA",
+];
+
+describe("Prod Fleet Native WSS", () => {
+  runAll(nodes);
+});
diff --git a/package.json b/package.json
index b7b40a1..e677815 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,9 @@
     "lint": "eslint . --ext .js",
     "format": "prettier --write .",
     "fix": "run-s lint format",
-    "prod": "mocha prodFleet.js",
-    "test": "mocha testFleet.js"
+    "predefined-prod": "mocha predefinedProdFleet.js --exit",
+    "predefined-test": "mocha predefinedTestFleet.js --exit ",
+    "native-wss": "mocha nativeWssProdFleet.js --exit"
   },
   "eslintConfig": {
     "env": {
diff --git a/prodFleet.js b/predefinedProdFleet.js
similarity index 79%
rename from prodFleet.js
rename to predefinedProdFleet.js
index 277698d..7b46409 100644
--- a/prodFleet.js
+++ b/predefinedProdFleet.js
@@ -6,6 +6,6 @@ const prodFleet =
   discovery.predefined.fleets.fleets["wakuv2.prod"]["waku-websocket"];
 const nodes = Object.values(prodFleet);
 
-describe("Prod Fleet", async () => {
-  await runAll(nodes);
+describe("Predefined Prod Fleet", () => {
+  runAll(nodes);
 });
diff --git a/testFleet.js b/predefinedTestFleet.js
similarity index 79%
rename from testFleet.js
rename to predefinedTestFleet.js
index b6e8409..6519eda 100644
--- a/testFleet.js
+++ b/predefinedTestFleet.js
@@ -6,6 +6,6 @@ const testFleet =
   discovery.predefined.fleets.fleets["wakuv2.test"]["waku-websocket"];
 const nodes = Object.values(testFleet);
 
-describe("Prod Fleet", async () => {
-  await runAll(nodes);
+describe("Predefined Test Fleet", () => {
+  runAll(nodes);
 });