diff --git a/.github/workflows/CI_endurance.yml b/.github/workflows/CI_endurance.yml
index 314bc19..f411e68 100644
--- a/.github/workflows/CI_endurance.yml
+++ b/.github/workflows/CI_endurance.yml
@@ -37,7 +37,7 @@ jobs:
 
       - name: Run Endurance Test (Group 1)
         run: |
-          go test -p=1 -v ./waku -count=1 -timeout=360m -run '^(TestStressMemoryUsageForThreeNodes|TestStressStoreQuery5kMessagesWithPagination|TestStressHighThroughput10kPublish|TestStressConnectDisconnect500Iteration)$' | tee testlogs1.log
+          go test -p=1 -v ./waku -count=1 -timeout=360m -run '^(TestStressMemoryUsageForThreeNodes|TestStressStoreQuery5kMessagesWithPagination|TestStressConnectDisconnect500Iteration|TestStressHighThroughput10kPublish)$' | tee testlogs1.log
 
       - name: Upload Test Logs (Group 1)
         uses: actions/upload-artifact@v4
@@ -78,7 +78,7 @@ jobs:
 
       - name: Run Endurance Test (Group 2)
         run: |
-          go test -p=1 -v ./waku -count=1 -timeout=360m -run '^(TestStressRandomNodesInMesh|TestStressLargePayloadEphemeralMessagesEndurance|TestStress2Nodes500IterationTearDown|TestPeerExchangePXLoad)$' | tee testlogs2.log
+          go test -p=1 -v ./waku -count=1 -timeout=360m -run '^(TestStressRandomNodesInMesh|TestStress2Nodes500IterationTearDown|TestPeerExchangePXLoad)$' | tee testlogs2.log
 
       - name: Upload Test Logs (Group 2)
         uses: actions/upload-artifact@v4
diff --git a/waku/stress_test.go b/waku/stress_test.go
index a1da267..e825214 100644
--- a/waku/stress_test.go
+++ b/waku/stress_test.go
@@ -92,7 +92,7 @@ func TestStressStoreQuery5kMessagesWithPagination(t *testing.T) {
 	}()
 
 	var memStats runtime.MemStats
-	iterations := 50
+	iterations := 500
 
 	runtime.ReadMemStats(&memStats)
 	initialHeapAlloc := memStats.HeapAlloc
@@ -157,7 +157,7 @@ func TestStressHighThroughput10kPublish(t *testing.T) {
 
 	Debug("Memory usage BEFORE sending => HeapAlloc: %d KB, RSS: %d KB", startHeapKB, startRSSKB)
 
-	totalMessages := 1500
+	totalMessages := 1000
 	pubsubTopic := DefaultPubsubTopic
 
 	for i := 0; i < totalMessages; i++ {
@@ -320,17 +320,21 @@ func TestStressLargePayloadEphemeralMessagesEndurance(t *testing.T) {
 	nodePubCfg.Relay = true
 	publisher, err := StartWakuNode("publisher", &nodePubCfg)
 	require.NoError(t, err)
-	defer publisher.StopAndDestroy()
 
 	nodeRecvCfg := DefaultWakuConfig
 	nodeRecvCfg.Relay = true
 	receiver, err := StartWakuNode("receiver", &nodeRecvCfg)
 	require.NoError(t, err)
-	defer receiver.StopAndDestroy()
 
 	err = receiver.RelaySubscribe(DefaultPubsubTopic)
 	require.NoError(t, err)
 
+	defer func() {
+		publisher.StopAndDestroy()
+		time.Sleep(30 * time.Second)
+		receiver.StopAndDestroy()
+
+	}()
 	err = publisher.ConnectPeer(receiver)
 	require.NoError(t, err)
 
@@ -373,7 +377,7 @@ func TestStressLargePayloadEphemeralMessagesEndurance(t *testing.T) {
 	endRSSKB, err := utils.GetRSSKB()
 	require.NoError(t, err)
 	Debug("After endurance test: HeapAlloc = %d KB, RSS = %d KB", endHeapKB, endRSSKB)
-	time.Sleep(10 * time.Second)
+
 }
 
 func TestStress2Nodes500IterationTearDown(t *testing.T) {