diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b0d09d0fb..0badb2418 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -79,7 +79,7 @@ jobs:
 
           echo "MIN_COVERAGE=$MIN_COVERAGE" >> "$GITHUB_OUTPUT"
       - name: Run Unit tests
-        run: poetry run pytest -m "not azure and not functional" --junitxml=coverage-junit.xml --cov=. --cov-report xml:coverage.xml --cov-fail-under ${{ steps.coverage-value.outputs.MIN_COVERAGE }}
+        run: make unittest optional_args="--junitxml=coverage-junit.xml --cov=. --cov-report xml:coverage.xml --cov-fail-under ${{ steps.coverage-value.outputs.MIN_COVERAGE }}"
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
@@ -89,4 +89,12 @@ jobs:
             coverage.xml
           if-no-files-found: error
       - name: Run Functional tests
-        run: poetry run pytest -m "functional"
+        run: make functionaltest
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: "npm"
+          cache-dependency-path: "code/frontend/package-lock.json"
+      - name: Run frontend unit tests
+        run: make unittest-frontend
diff --git a/Makefile b/Makefile
index a0d2b1c95..10b5d85e1 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ lint: ## 🧹 Lint the code
 
 unittest: ## 🧪 Run the unit tests
 	@echo -e "\e[34m$@\e[0m" || true
-	@poetry run pytest -m "not azure and not functional"
+	@poetry run pytest -m "not azure and not functional" $(optional_args)
 
 functionaltest: ## 🧪 Run the functional tests
 	@echo -e "\e[34m$@\e[0m" || true