diff --git a/tests/e2e/test_e2e.py b/tests/e2e/test_e2e.py
index cfd28815..b53bd162 100644
--- a/tests/e2e/test_e2e.py
+++ b/tests/e2e/test_e2e.py
@@ -421,31 +421,39 @@ class TestE2E(StepsFilter, StepsStore, StepsRelay, StepsLightPush):
         logger.debug("Check if message is stored ")
         self.check_published_message_is_stored(page_size=50, ascending="true", store_node=self.node3, messages_to_check=[message])
 
-    def test_temp_test(self):
-        self.node4 = WakuNode(NODE_2, f"node4_{self.test_id}")
-        self.node5 = WakuNode(NODE_2, f"node5_{self.test_id}")
-        self.node6 = WakuNode(NODE_2, f"node6_{self.test_id}")
+    def test_multiple_edge_service_nodes(self):
+        self.edge_node1 = WakuNode(NODE_2, f"node4_{self.test_id}")
+        self.edge_node2 = WakuNode(NODE_2, f"node5_{self.test_id}")
+        self.service_node1 = WakuNode(NODE_2, f"node6_{self.test_id}")
+        self.service_node2 = WakuNode(NODE_2, f"node7_{self.test_id}")
+        self.service_node3 = WakuNode(NODE_2, f"node8_{self.test_id}")
 
-        self.node1.start(relay="true", store="true", lightpush="true")  # service node1
-        self.node2.start(
-            relay="false", lightpushnode=self.node1.get_multiaddr_with_id(), discv5_bootstrap_node=self.node1.get_enr_uri()
+        logger.debug("Start 2 edges nodes and 3 service nodes ")
+        self.service_node1.start(relay="true", store="true", lightpush="true")  # service node1
+        self.edge_node1.start(
+            relay="false", lightpushnode=self.service_node1.get_multiaddr_with_id(), discv5_bootstrap_node=self.service_node1.get_enr_uri()
         )  # edge node1
-        self.node3.start(relay="true", store="true", discv5_bootstrap_node=self.node1.get_enr_uri())  # service node2
-        self.node5.start(
+        self.service_node2.start(relay="true", store="true", discv5_bootstrap_node=self.service_node1.get_enr_uri())  # service node2
+        self.service_node3.start(
             relay="true", filter="true", storenode=self.node3.get_multiaddr_with_id(), discv5_bootstrap_node=self.node3.get_enr_uri()
         )  # relay node3
-        self.node4.start(
+        self.edge_node2.start(
             relay="false",
-            filternode=self.node5.get_multiaddr_with_id(),
-            storenode=self.node3.get_multiaddr_with_id(),
-            discv5_bootstrap_node=self.node3.get_enr_uri(),
+            filternode=self.service_node3.get_multiaddr_with_id(),
+            storenode=self.service_node2.get_multiaddr_with_id(),
+            discv5_bootstrap_node=self.service_node2.get_enr_uri(),
         )  # edge node2
-        self.node1.set_relay_subscriptions([self.test_pubsub_topic])
-        self.node3.set_relay_subscriptions([self.test_pubsub_topic])
-        self.wait_for_autoconnection([self.node1, self.node3], hard_wait=30)
+
+        logger.debug("Connect 3 service nodes to relay subscriptions")
+        self.service_node1.set_relay_subscriptions([self.test_pubsub_topic])
+        self.service_node2.set_relay_subscriptions([self.test_pubsub_topic])
+        self.service_node3.set_relay_subscriptions([self.test_pubsub_topic])
+        self.wait_for_autoconnection([self.service_node1, self.service_node2, self.service_node3], hard_wait=30)
 
         message = self.create_message()
-        self.node4.set_filter_subscriptions({"requestId": "1", "contentFilters": [self.test_content_topic], "pubsubTopic": self.test_pubsub_topic})
+        self.edge_node2.set_filter_subscriptions(
+            {"requestId": "1", "contentFilters": [self.test_content_topic], "pubsubTopic": self.test_pubsub_topic}
+        )
 
         self.check_light_pushed_message_reaches_receiving_peer(sender=self.node2, peer_list=[self.node1], message=message)