diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index b6972e1932..c7015c60ef 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -48,6 +48,7 @@ jobs:
       cacheKey: ${{ github.sha }}-base:build
       collectCoverage: ${{ matrix.node-version == '20.x' }}
       ignoreTurboCache: ${{ matrix.node-version == '20.x' }}
+      skipFrontendTests: ${{ matrix.node-version != '20.x' }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
diff --git a/.github/workflows/units-tests-dispatch.yml b/.github/workflows/units-tests-dispatch.yml
index 5ad63f000e..72a9db5b6a 100644
--- a/.github/workflows/units-tests-dispatch.yml
+++ b/.github/workflows/units-tests-dispatch.yml
@@ -12,6 +12,11 @@ on:
         description: 'PR number to run tests for.'
         required: false
         type: number
+      skipFrontendTests:
+        description: 'Skip Frontend tests'
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   prepare:
@@ -37,3 +42,4 @@ jobs:
     uses: ./.github/workflows/units-tests-reusable.yml
     with:
       ref: ${{ needs.prepare.outputs.branch }}
+      skipFrontendTests: ${{ inputs.skipFrontendTests }}
diff --git a/.github/workflows/units-tests-reusable.yml b/.github/workflows/units-tests-reusable.yml
index 62eca74b15..06d560cdbe 100644
--- a/.github/workflows/units-tests-reusable.yml
+++ b/.github/workflows/units-tests-reusable.yml
@@ -26,6 +26,10 @@ on:
         required: false
         default: false
         type: boolean
+      skipFrontendTests:
+        required: false
+        default: false
+        type: boolean
     secrets:
       CODECOV_TOKEN:
         description: 'Codecov upload token.'
@@ -74,6 +78,7 @@ jobs:
         run: pnpm test:nodes
 
       - name: Test Frontend
+        if: ${{ !inputs.skipFrontendTests }}
         run: pnpm test:frontend
 
       - name: Upload coverage to Codecov