diff --git a/src/lib/wait_for_remote_peer.node.spec.ts b/src/lib/wait_for_remote_peer.node.spec.ts
index 57b0a7c357..06bf3e92b3 100644
--- a/src/lib/wait_for_remote_peer.node.spec.ts
+++ b/src/lib/wait_for_remote_peer.node.spec.ts
@@ -21,7 +21,12 @@ describe("Wait for remote peer", function () {
   it("Relay - dialed first", async function () {
     this.timeout(20_000);
     nwaku = new Nwaku(makeLogFileName(this));
-    await nwaku.start();
+    await nwaku.start({
+      relay: true,
+      store: false,
+      filter: false,
+      lightpush: false,
+    });
     const multiAddrWithId = await nwaku.getMultiaddrWithId();
 
     waku = await createWaku({
@@ -41,7 +46,12 @@ describe("Wait for remote peer", function () {
   it("Relay - dialed after", async function () {
     this.timeout(20_000);
     nwaku = new Nwaku(makeLogFileName(this));
-    await nwaku.start();
+    await nwaku.start({
+      relay: true,
+      store: false,
+      filter: false,
+      lightpush: false,
+    });
     const multiAddrWithId = await nwaku.getMultiaddrWithId();
 
     waku = await createWaku({
@@ -84,7 +94,12 @@ describe("Wait for remote peer", function () {
   it("Store - dialed first", async function () {
     this.timeout(20_000);
     nwaku = new Nwaku(makeLogFileName(this));
-    await nwaku.start({ persistMessages: true });
+    await nwaku.start({
+      store: true,
+      relay: false,
+      lightpush: false,
+      filter: false,
+    });
     const multiAddrWithId = await nwaku.getMultiaddrWithId();
 
     waku = await createWaku({
@@ -105,7 +120,12 @@ describe("Wait for remote peer", function () {
   it("Store - dialed after - with timeout", async function () {
     this.timeout(20_000);
     nwaku = new Nwaku(makeLogFileName(this));
-    await nwaku.start({ persistMessages: true });
+    await nwaku.start({
+      store: true,
+      relay: false,
+      lightpush: false,
+      filter: false,
+    });
     const multiAddrWithId = await nwaku.getMultiaddrWithId();
 
     waku = await createWaku({
@@ -128,7 +148,12 @@ describe("Wait for remote peer", function () {
   it("LightPush", async function () {
     this.timeout(20_000);
     nwaku = new Nwaku(makeLogFileName(this));
-    await nwaku.start({ lightpush: true });
+    await nwaku.start({
+      lightpush: true,
+      filter: false,
+      relay: false,
+      store: false,
+    });
     const multiAddrWithId = await nwaku.getMultiaddrWithId();
 
     waku = await createWaku({
@@ -151,7 +176,12 @@ describe("Wait for remote peer", function () {
   it("Filter", async function () {
     this.timeout(20_000);
     nwaku = new Nwaku(makeLogFileName(this));
-    await nwaku.start({ filter: true });
+    await nwaku.start({
+      filter: true,
+      lightpush: false,
+      relay: false,
+      store: false,
+    });
     const multiAddrWithId = await nwaku.getMultiaddrWithId();
 
     waku = await createWaku({