diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c3b45f200c..166a62e7d1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -72,13 +72,28 @@ jobs:
         with:
           node-version: '16'
 
-      - name: e2e
+      - name: component tests
         uses: cypress-io/github-action@v4
         with:
           start: yarn run serve --hide=CLIENT  # turn off build output because it's absurdly long
           wait-on: http://localhost:8080/
           config-file: cypress.config.js
-          spec: "tests/e2e/**/*"
+          component: true
+          spec: |
+            cypress/component/*
+            cypress/component/**/*
+          browser: ${{ matrix.browser }}
+        env:
+          CYPRESS_baseUrl: http://localhost:8080/
+
+      - name: e2e tests
+        uses: cypress-io/github-action@v4
+        with:
+          start: yarn run serve --hide=CLIENT  # turn off build output because it's absurdly long
+          wait-on: http://localhost:8080/
+          config-file: cypress.config.js
+          spec: |
+            tests/e2e/**/*
           browser: ${{ matrix.browser }}
         env:
           CYPRESS_baseUrl: http://localhost:8080/