diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca3c513f501..d34901e7844 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,6 +9,7 @@ jobs:
     name: PHP ${{ matrix.php }} WP ${{ matrix.wp }}
     timeout-minutes: 15
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.wp == 'nightly' }}
     strategy:
       fail-fast: false
       matrix:
@@ -70,11 +71,5 @@ jobs:
       - name: Init DB and WP
         run: ./tests/bin/install.sh woo_test root root 127.0.0.1 ${{ matrix.wp }}
 
-      - name: Run WP nightly tests (failures allowed)
-        if: ${{ matrix.wp == 'nightly' }}
-        continue-on-error: true
-        run: ./vendor/bin/phpunit -c ./phpunit.xml
-
       - name: Run tests
-        if: ${{ matrix.wp != 'nightly' }}
         run: ./vendor/bin/phpunit -c ./phpunit.xml
diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml
index 4f9a6f89d35..5823b209c24 100644
--- a/.github/workflows/pr-unit-tests.yml
+++ b/.github/workflows/pr-unit-tests.yml
@@ -6,6 +6,7 @@ jobs:
     name: PHP ${{ matrix.php }} WP ${{ matrix.wp }}
     timeout-minutes: 15
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.wp == 'nightly' }}
     strategy:
       fail-fast: false
       matrix:
@@ -67,11 +68,5 @@ jobs:
       - name: Init DB and WP
         run: ./tests/bin/install.sh woo_test root root 127.0.0.1 ${{ matrix.wp }}
 
-      - name: Run WP nightly tests (failures allowed)
-        if: ${{ matrix.wp == 'nightly' }}
-        continue-on-error: true
-        run: ./vendor/bin/phpunit -c ./phpunit.xml
-
       - name: Run tests
-        if: ${{ matrix.wp != 'nightly' }}
         run: ./vendor/bin/phpunit -c ./phpunit.xml