diff --git a/packages/tests/tests/filter/multiple_pubsub.node.spec.ts b/packages/tests/tests/filter/single_node/multiple_pubsub.node.spec.ts
similarity index 99%
rename from packages/tests/tests/filter/multiple_pubsub.node.spec.ts
rename to packages/tests/tests/filter/single_node/multiple_pubsub.node.spec.ts
index c2d2a1b7d6..b695229d38 100644
--- a/packages/tests/tests/filter/multiple_pubsub.node.spec.ts
+++ b/packages/tests/tests/filter/single_node/multiple_pubsub.node.spec.ts
@@ -20,9 +20,8 @@ import {
   MessageCollector,
   ServiceNode,
   tearDownNodes
-} from "../../src/index.js";
-
-import { runNodes } from "./utils.js";
+} from "../../../src/index.js";
+import { runNodes } from "../utils.js";
 
 describe("Waku Filter V2: Multiple PubsubTopics", function () {
   // Set the timeout for all tests in this suite. Can be overwritten at test level
diff --git a/packages/tests/tests/filter/ping.node.spec.ts b/packages/tests/tests/filter/single_node/ping.node.spec.ts
similarity index 98%
rename from packages/tests/tests/filter/ping.node.spec.ts
rename to packages/tests/tests/filter/single_node/ping.node.spec.ts
index 53d25443ca..5f73c8cbd5 100644
--- a/packages/tests/tests/filter/ping.node.spec.ts
+++ b/packages/tests/tests/filter/single_node/ping.node.spec.ts
@@ -7,15 +7,14 @@ import {
   MessageCollector,
   ServiceNode,
   tearDownNodes
-} from "../../src/index.js";
-
+} from "../../../src/index.js";
 import {
   runNodes,
   TestContentTopic,
   TestDecoder,
   TestEncoder,
   validatePingError
-} from "./utils.js";
+} from "../utils.js";
 
 describe("Waku Filter V2: Ping", function () {
   // Set the timeout for all tests in this suite. Can be overwritten at test level
diff --git a/packages/tests/tests/filter/push.node.spec.ts b/packages/tests/tests/filter/single_node/push.node.spec.ts
similarity index 99%
rename from packages/tests/tests/filter/push.node.spec.ts
rename to packages/tests/tests/filter/single_node/push.node.spec.ts
index b0c07740db..969fa99b87 100644
--- a/packages/tests/tests/filter/push.node.spec.ts
+++ b/packages/tests/tests/filter/single_node/push.node.spec.ts
@@ -12,15 +12,14 @@ import {
   tearDownNodes,
   TEST_STRING,
   TEST_TIMESTAMPS
-} from "../../src/index.js";
-
+} from "../../../src/index.js";
 import {
   messageText,
   runNodes,
   TestContentTopic,
   TestDecoder,
   TestEncoder
-} from "./utils.js";
+} from "../utils.js";
 
 describe("Waku Filter V2: FilterPush", function () {
   // Set the timeout for all tests in this suite. Can be overwritten at test level
diff --git a/packages/tests/tests/filter/subscribe.node.spec.ts b/packages/tests/tests/filter/single_node/subscribe.node.spec.ts
similarity index 99%
rename from packages/tests/tests/filter/subscribe.node.spec.ts
rename to packages/tests/tests/filter/single_node/subscribe.node.spec.ts
index 41ca9c7475..22dde6bab7 100644
--- a/packages/tests/tests/filter/subscribe.node.spec.ts
+++ b/packages/tests/tests/filter/single_node/subscribe.node.spec.ts
@@ -20,8 +20,7 @@ import {
   ServiceNode,
   tearDownNodes,
   TEST_STRING
-} from "../../src/index.js";
-
+} from "../../../src/index.js";
 import {
   messagePayload,
   messageText,
@@ -29,7 +28,7 @@ import {
   TestContentTopic,
   TestDecoder,
   TestEncoder
-} from "./utils.js";
+} from "../utils.js";
 
 describe("Waku Filter V2: Subscribe", function () {
   // Set the timeout for all tests in this suite. Can be overwritten at test level
diff --git a/packages/tests/tests/filter/unsubscribe.node.spec.ts b/packages/tests/tests/filter/single_node/unsubscribe.node.spec.ts
similarity index 99%
rename from packages/tests/tests/filter/unsubscribe.node.spec.ts
rename to packages/tests/tests/filter/single_node/unsubscribe.node.spec.ts
index 1eea9fffe7..4b6f545930 100644
--- a/packages/tests/tests/filter/unsubscribe.node.spec.ts
+++ b/packages/tests/tests/filter/single_node/unsubscribe.node.spec.ts
@@ -9,8 +9,7 @@ import {
   MessageCollector,
   ServiceNode,
   tearDownNodes
-} from "../../src/index.js";
-
+} from "../../../src/index.js";
 import {
   messagePayload,
   messageText,
@@ -18,7 +17,7 @@ import {
   TestContentTopic,
   TestDecoder,
   TestEncoder
-} from "./utils.js";
+} from "../utils.js";
 
 describe("Waku Filter V2: Unsubscribe", function () {
   // Set the timeout for all tests in this suite. Can be overwritten at test level
diff --git a/packages/tests/tests/light-push/index.node.spec.ts b/packages/tests/tests/light-push/single_node/index.node.spec.ts
similarity index 99%
rename from packages/tests/tests/light-push/index.node.spec.ts
rename to packages/tests/tests/light-push/single_node/index.node.spec.ts
index 0dc8ccd405..cc12f846bc 100644
--- a/packages/tests/tests/light-push/index.node.spec.ts
+++ b/packages/tests/tests/light-push/single_node/index.node.spec.ts
@@ -14,15 +14,14 @@ import {
   ServiceNode,
   tearDownNodes,
   TEST_STRING
-} from "../../src/index.js";
-
+} from "../../../src/index.js";
 import {
   messagePayload,
   messageText,
   runNodes,
   TestContentTopic,
   TestEncoder
-} from "./utils.js";
+} from "../utils.js";
 
 describe("Waku Light Push", function () {
   // Set the timeout for all tests in this suite. Can be overwritten at test level
diff --git a/packages/tests/tests/light-push/multiple_pubsub.node.spec.ts b/packages/tests/tests/light-push/single_node/multiple_pubsub.node.spec.ts
similarity index 99%
rename from packages/tests/tests/light-push/multiple_pubsub.node.spec.ts
rename to packages/tests/tests/light-push/single_node/multiple_pubsub.node.spec.ts
index fb90c4aff4..19e852e317 100644
--- a/packages/tests/tests/light-push/multiple_pubsub.node.spec.ts
+++ b/packages/tests/tests/light-push/single_node/multiple_pubsub.node.spec.ts
@@ -20,9 +20,8 @@ import {
   MessageCollector,
   ServiceNode,
   tearDownNodes
-} from "../../src/index.js";
-
-import { messageText, runNodes } from "./utils.js";
+} from "../../../src/index.js";
+import { messageText, runNodes } from "../utils.js";
 
 describe("Waku Light Push : Multiple PubsubTopics", function () {
   this.timeout(30000);