diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index ece1130..67a226c 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -2,35 +2,37 @@ name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [main, master]
   pull_request:
-    branches: [main]
+    branches: [main, master]
 
 jobs:
   test:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.11'
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e . pytest pytest-cov
-      - name: Run tests
-        run: pytest tests/ -v --tb=short || exit 1
+          pip install -e ".[dev]"
 
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-      - name: Install ruff
-        run: pip install ruff
-      - name: Run ruff
-        run: ruff check src/confgen/ || exit 1
+      - name: Run tests
+        run: |
+          python -m pytest tests/ -v --tb=short
+          EXIT_CODE=$?
+          if [ $EXIT_CODE -ne 0 ]; then
+            echo "Tests failed with exit code $EXIT_CODE"
+            exit $EXIT_CODE
+          fi
+
+      - name: Run linting
+        run: |
+          pip install ruff
+          ruff check src/confgen/ tests/