diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c79678d..541c08c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,21 +1,46 @@
-name: Test
+name: Tests
 
 on:
-  pull_request:
+  workflow_dispatch:
   push:
-    branches:
-      - master
-      - stable*
-    
+    paths-ignore:
+    - 'LICENSE'
+    - '**.md'
+  pull_request:
+    paths-ignore:
+    - 'LICENSE'
+    - '**.md'
+
 jobs:
-  run-test-debian:
+  unit:
+    name: Unit Tests
     runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        base_docker_image: [alpine, debian]
+
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup Docker
-        uses: docker-practice/actions-setup-docker@master
-      - name: Print docker version
-        run: docker version
-      - name: Run Makefile
-        run: make test-debian    
+      - uses: actions/checkout@v2
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r python-requirements.txt
+        working-directory: test/requirements
+
+      - name: Build Docker web server image
+        run: make build-webserver
+
+      - name: Build Docker nginx proxy test image
+        run: make build-nginx-proxy-test-${{ matrix.base_docker_image }}
+
+      - name: Run tests
+        run: pytest
+        working-directory: test
\ No newline at end of file