diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 1e21551..fc2aee9 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -6,7 +6,7 @@ on:
     - cron: '0 2 * * *'
 
 jobs:
-  endurance:
+  Daily:
     runs-on: ubuntu-latest
 
     steps:
@@ -39,12 +39,11 @@ jobs:
 
       - name: Run Endurance Test
         run: |
-          # matches every Test… function *except* TestStress
           go test -p=1 -v ./waku -count=1 -timeout=360m \
-          -run '^Test($|[^S]|S[^t])' | tee testlogs.log
+            | tee testlogs.log
 
       - name: Upload Test Logs
         uses: actions/upload-artifact@v4
         with:
-          name: endurance-logs
+          name: daily-logs
           path: testlogs.log
diff --git a/.github/workflows/CI_endurance.yml b/.github/workflows/CI_endurance.yml
index 00a4d4d..27b2cf6 100644
--- a/.github/workflows/CI_endurance.yml
+++ b/.github/workflows/CI_endurance.yml
@@ -39,7 +39,8 @@ jobs:
         shell: bash
         run: |
           set -euo pipefail
-          go test -p=1 -v ./waku -count=1 -timeout=360m -run '^(TestStressMemoryUsageForThreeNodes|TestStressStoreQuery5kMessagesWithPagination|TestStressHighThroughput10kPublish|TestStressLargePayloadEphemeralMessagesEndurance|TestStressConnectDisconnect1kIteration)$' | tee testlogs1.log
+          go test -tags stress  \
+          -p=1 -v ./waku -count=1 -timeout=360m -run '^(TestStressMemoryUsageForThreeNodes|TestStressStoreQuery5kMessagesWithPagination|TestStressHighThroughput10kPublish|TestStressLargePayloadEphemeralMessagesEndurance|TestStressConnectDisconnect1kIteration)$' | tee testlogs1.log
 
       - name: Upload Test Logs (Group 1)
         uses: actions/upload-artifact@v4
@@ -89,7 +90,8 @@ jobs:
         shell: bash
         run: |
           set -euo pipefail
-          go test -p=1 -v ./waku -count=1 -timeout=360m -run '^(TestStressRandomNodesInMesh|TestStress2Nodes2kIterationTearDown|TestPeerExchangePXLoad)$' | tee testlogs2.log
+          go test -tags stress \
+          -p=1 -v ./waku -count=1 -timeout=360m -run '^(TestStressRandomNodesInMesh|TestStress2Nodes2kIterationTearDown|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 4948895..1849254 100644
--- a/waku/stress_test.go
+++ b/waku/stress_test.go
@@ -1,5 +1,5 @@
-//go:build !stress
-// +build !stress
+//go:build stress
+// +build stress
 
 package waku