diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e566837505..460201b093 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   setup:
     runs-on: ${{ matrix.os }}
-    if: github.event_name == 'push' || !(github.base_ref == '2.x' && github.head_ref == 'dev')
+    if: github.event_name == 'push' || !((github.base_ref == '2.x' || github.base_ref == 'next') && github.head_ref == 'dev')
 
     strategy:
       matrix: