diff --git a/.github/workflows/webclient-cicd.yml b/.github/workflows/webclient-cicd.yml
index 6403f382e..711451804 100644
--- a/.github/workflows/webclient-cicd.yml
+++ b/.github/workflows/webclient-cicd.yml
@@ -26,7 +26,14 @@ jobs:
         with:
           version: 8
           package_json_file: webclient/package.json
-      - name: Cypress run
+      - name: Cypress - component tests
+        uses: cypress-io/github-action@v5
+        with:
+          component: true
+          wait-on: "http://localhost:3000"
+          browser: ${{ matrix.browser }}
+          working-directory: webclient
+      - name: Cypress - e2e tests
         uses: cypress-io/github-action@v5
         with:
           start: npm run dev
diff --git a/webclient/package.json b/webclient/package.json
index d5c48e60e..9d58cae56 100644
--- a/webclient/package.json
+++ b/webclient/package.json
@@ -2,10 +2,13 @@
   "name": "navigatum",
   "version": "0.1.0",
   "scripts": {
-    "cy:run:chrome": "cypress run --browser chrome",
-    "cy:run:firefox": "cypress run --browser firefox:dev",
+    "cy:run:chrome:component": "cypress run --browser chrome --component",
+    "cy:run:chrome:e2e": "cypress run --browser chrome --e2e",
+    "cy:run:firefox:component": "cypress run --browser firefox:dev --component",
+    "cy:run:firefox:e2e": "cypress run --browser firefox:dev --e2e",
     "cy:open": "cypress open",
-    "test": "run-p cy:run:chrome cy:run:firefox",
+    "test": "run-p cy:run:firefox:e2e cy:run:chrome:e2e",
+    "test:components": "run-p cy:run:chrome:component cy:run:firefox:component",
     "dev": "vite",
     "build": "run-p type-check build-only",
     "preview": "vite preview --port 3000",