diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ca368869b02..51e5d7e8dd8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -49,10 +49,13 @@ jobs:
           npm run test-types-file
 
       - name: Run unit tests
+        uses: nick-invision/retry@v2
         env:
           CHROMIUM: true
-        run: |
-          xvfb-run --auto-servernum npm run unit
+        with:
+          max_attempts: 3
+          command: xvfb-run --auto-servernum npm run unit
+          timeout_minutes: 10
 
       - name: Run unit tests with coverage
         env:
@@ -62,11 +65,15 @@ jobs:
           xvfb-run --auto-servernum npm run assert-unit-coverage
 
       - name: Run unit tests on Firefox
+        uses: nick-invision/retry@v2
         env:
           FIREFOX: true
           MOZ_WEBRENDER: 0
-        run: |
-          xvfb-run --auto-servernum npm run funit
+        with:
+          max_attempts: 3
+          timeout_minutes: 10
+          command: xvfb-run --auto-servernum npm run funit
+
       - name: Run browser tests
         run: |
           npm run test-browser
@@ -115,11 +122,11 @@ jobs:
           npm run unit
 
       - name: Run unit tests on Firefox
-        env:
-          FIREFOX: true
-          MOZ_WEBRENDER: 0
-        run: |
-          npm run funit
+        uses: nick-invision/retry@v2
+        with:
+          max_attempts: 3
+          timeout_minutes: 10
+          command: npm run funit
 
   windows:
     # https://github.com/actions/virtual-environments#available-environments
@@ -158,8 +165,11 @@ jobs:
           npm run unit
 
       - name: Run unit tests on Firefox
+        uses: nick-invision/retry@v2
         env:
           FIREFOX: true
           MOZ_WEBRENDER: 0
-        run: |
-          npm run funit
+        with:
+          max_attempts: 3
+          timeout_minutes: 10
+          command: npm run funit