diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index a9e8b91..43a65a3 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Run Daily Test
         run: |
           set -euo pipefail
-          go test -count=10 -p=1 -v -timeout=360m ./waku \
+          go test -p=1 -v -timeout=360m ./waku -count=10 \
             | tee testlogs.log
 
       - name: Upload Test Logs
diff --git a/.github/workflows/Repeated_tests_endurancce.yml b/.github/workflows/Repeated_tests_endurancce.yml
index 0632cb0..7e51826 100644
--- a/.github/workflows/Repeated_tests_endurancce.yml
+++ b/.github/workflows/Repeated_tests_endurancce.yml
@@ -42,11 +42,11 @@ jobs:
       - name: Repeated test runs
         run: |
           set +e
-          for i in {1..80}; do
+          for i in {1..3}; do
             echo "Iteration $i: measuring memory BEFORE the tests..."
             go run tools/memory_record.go --iteration $i --phase start
             echo "Running tests (iteration $i)..."
-            go test -v -tags '!stress' ./...
+            go test -tags=stress -p=1 -v -timeout=360m ./waku
             echo "Iteration $i: measuring memory AFTER the tests..."
             go run tools/memory_record.go --iteration $i --phase end
           done
diff --git a/waku/stress_test.go b/waku/stress_test.go
index 44fd484..e5f96dd 100644
--- a/waku/stress_test.go
+++ b/waku/stress_test.go
@@ -65,6 +65,7 @@ func TestStressMemoryUsageForThreeNodes(t *testing.T) {
 }
 
 func TestStressStoreQuery5kMessagesWithPagination(t *testing.T) {
+	t.Skip("Skipping temporarily for CI performance or debug reasons")
 	Debug("Starting test")
 	runtime.GC()
 	nodeConfig := DefaultWakuConfig
@@ -159,6 +160,7 @@ func TestStressHighThroughput10kPublish(t *testing.T) {
 
 
 func TestStressConnectDisconnect1kIteration(t *testing.T) {
+	t.Skip("Skipping temporarily for CI performance")
 	captureMemory(t.Name(), "at start")
 
 	node0Cfg := DefaultWakuConfig