diff --git a/.github/workflows/ci-nightly.yml b/.github/workflows/ci-nightly.yml
index c2988809f36..205cd10b033 100644
--- a/.github/workflows/ci-nightly.yml
+++ b/.github/workflows/ci-nightly.yml
@@ -76,7 +76,7 @@ jobs:
           java-version: ${{ matrix.java-version }}
           distribution: temurin
       - name: Test
-        run: mvn -B -e -fae verify -Pactivemq.tests-quick
+        run: mvn -B -e -fae verify -Pactivemq.tests-quick -Dsurefire.rerunFailingTestsCount=3
       - name: Upload Test Results
         if: (!cancelled())
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/ci-weekly.yml b/.github/workflows/ci-weekly.yml
index a6194c19546..3c07c6b0583 100644
--- a/.github/workflows/ci-weekly.yml
+++ b/.github/workflows/ci-weekly.yml
@@ -70,7 +70,7 @@ jobs:
           java-version: 17
           distribution: temurin
       - name: Test
-        run: mvn -B -e -fae verify
+        run: mvn -B -e -fae verify -Dsurefire.rerunFailingTestsCount=3
       - name: Upload Test Results
         if: (!cancelled())
         uses: actions/upload-artifact@v4