diff --git a/.circleci/config.yml b/.circleci/config.yml
index ba72be81ac057135ed7253ce400aaff67bc5fe38..4b6415be2413e5f54467735f154968960628f76b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -716,14 +716,6 @@ jobs:
                   - /home/circleci/metabase/metabase/node_modules
                   - /home/circleci/.cache/Cypress
 
-  fe-tests-unit:
-    executor: clojure-and-node
-    steps:
-      - run-yarn-command:
-          command-name: Run frontend unit tests
-          command: run test-unit
-          skip-when-no-change: true
-
   shared-tests-cljs:
     executor: clojure-and-node
     steps:
@@ -732,14 +724,6 @@ jobs:
           command: run test-cljs
           skip-when-no-change: true
 
-  fe-tests-timezones:
-    executor: clojure-and-node
-    steps:
-      - run-yarn-command:
-          command-name: Run frontend timezone tests
-          command: run test-timezones
-          skip-when-no-change: true
-
   # Unlike the other build-uberjar steps, this step should be run once overall and the results can be shared between
   # OSS and EE uberjars.
   build-uberjar-drivers:
@@ -1169,15 +1153,9 @@ workflows:
       - fe-deps:
           requires:
             - checkout
-      - fe-tests-unit:
-          requires:
-            - fe-deps
       - shared-tests-cljs:
           requires:
             - fe-deps
-      - fe-tests-timezones:
-          requires:
-            - fe-deps
 
       - fe-tests-cypress:
           matrix:
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index d0b1c78e773f29bdf451bb914063b69f955fe16b..4ebee9f2ac2f526ed5fd232c6856c2ef14c878b7 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -16,7 +16,7 @@ on:
     - 'shared/**'
     - 'enterprise/frontend/**'
     - 'docs/**'
-    - '**/package.lock'
+    - '**/package.json'
     - '**/yarn.lock'
     - '.github/workflows/**'
 
@@ -75,3 +75,39 @@ jobs:
     - run: yarn install --frozen-lockfile --prefer-offline
     - run: yarn run lint-docs-links
       name: Run docs links checker
+
+  fe-tests-unit:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 10
+    steps:
+    - uses: actions/checkout@v2
+    - name: Prepare Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: 14.x
+    - name: Get yarn cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/yarn
+        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+    - run: yarn install --frozen-lockfile --prefer-offline
+    - run: yarn run test-unit
+      name: Run frontend unit tests
+
+  fe-tests-timezones:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 10
+    steps:
+    - uses: actions/checkout@v2
+    - name: Prepare Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: 14.x
+    - name: Get yarn cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/yarn
+        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+    - run: yarn install --frozen-lockfile --prefer-offline
+    - run: yarn run test-timezones
+      name: Run frontend timezones tests