diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 395d825b1f0a0..b9460bae40734 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -40,6 +40,12 @@ jobs:
         run: |
           npm run build
 
+      - name: Run unit tests on Firefox
+        env:
+          FIREFOX: true
+        run: |
+          DEBUG=puppeteer:* xvfb-run --auto-servernum npm run funit
+
       - name: Run code checks
         run: |
           npm run lint
@@ -60,13 +66,6 @@ jobs:
           xvfb-run --auto-servernum npm run unit-with-coverage
           xvfb-run --auto-servernum npm run assert-unit-coverage
 
-      # Temporarily disabled due to Firefox Nightly flakes.
-      # - name: Run unit tests on Firefox
-      #   env:
-      #     FIREFOX: true
-      #   run: |
-      #     xvfb-run --auto-servernum npm run funit
-
       - name: Run browser tests
         run: |
           npm run test-browser