diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ff94962a79..5761601f9d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -111,7 +111,12 @@ jobs:
           cache: yarn
 
       - run: yarn
+
       - run: yarn test:unit
+        if: matrix.node == '16.13.0'
+
+      - run: yarn test:unit:base
+        if: matrix.node != '16.13.0'
 
       - uses: codecov/codecov-action@v2
 
diff --git a/package.json b/package.json
index 8239bc33e9..52daa86837 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,8 @@
     "test": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js --timeout=60000",
     "test:all": "yarn test:unit && yarn test:integration && yarn test:e2e && yarn lint",
     "test:debug": "DEBUG=ghost:test* yarn test",
-    "test:unit": "c8 mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/unit' --timeout=2000",
+    "test:unit": "c8 yarn test:unit:base",
+    "test:unit:base": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/unit' --timeout=2000",
     "test:integration": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/integration' --timeout=5000",
     "test:e2e": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/e2e-api' './test/e2e-frontend' './test/e2e-server' --timeout=10000",
     "test:regression": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/regression' --timeout=60000",