diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d3cd79d7b..6121b67cc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -59,6 +59,7 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
+
       - name: Run checkstyle
         uses: dbelyaev/action-checkstyle@v1.14.0
         with:
@@ -67,3 +68,5 @@ jobs:
           workdir: ./server
           checkstyle_config: ./server/checkstyle.xml
           level: error
+      - name: Run unit tests
+        run: cd ./server && ./mvnw -Dtest='!de.uftos.e2e.**,!UftosApplicationTests' test
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..edbc416c6
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+dev:
+	docker compose -f ./docker-compose.yml up
+dev-update:
+	docker compose -f ./docker-compose.yml up --build -V
+test:
+	cd ./server && ./mvnw -Dtest='!de.uftos.e2e.**,!UftosApplicationTests' test
+test-stupid:
+	cd ./server && ./mvnw.cmd -Dtest='!de.uftos.e2e.**,!UftosApplicationTests' test
+e2e:
+	cd ./server && DB_HOST=localhost DB_PORT=5432 DB_USER=uftos DB_PASSWORD=superSecurePassword DB_NAME=uftos ./mvnw -Dtest='de.uftos.e2e.**,UftosApplicationTests' test
+e2e-stupid:
+	cd ./server DB_HOST=localhost DB_PORT=5432 DB_USER=uftos DB_PASSWORD=superSecurePassword DB_NAME=uftos ./mvnw.cmd -Dtest='de.uftos.e2e.**,UftosApplicationTests' test