diff --git a/.github/actions/setup/docker-compose.yml b/.github/actions/setup/docker-compose.yml
index 5d7a1053d..9a24d24a3 100644
--- a/.github/actions/setup/docker-compose.yml
+++ b/.github/actions/setup/docker-compose.yml
@@ -3,6 +3,7 @@ version: "3.7"
 services:
   postgresql:
     image: docker.io/library/postgres:${PSQL_TAG:-12}
+    command: ["postgres", "-c", "log_statement=all", "-c", "log_destination=stderr"]
     volumes:
       - db-data:/var/lib/postgresql/data
     environment:
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 71bfc0d7a..cdfa5f868 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -125,6 +125,9 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           flags: unit
+      - if: ${{ always() }}
+        run: |
+          docker logs setup-postgresql-1
   test-integration:
     runs-on: ubuntu-latest
     timeout-minutes: 30
diff --git a/Makefile b/Makefile
index 3c925de9d..b492b68c2 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ test-docker:  ## Run all tests in a docker-compose
 	rm -f .env
 
 test: ## Run the server tests and produce a coverage report (locally)
-	coverage run manage.py test --keepdb authentik
+	coverage run manage.py test --keepdb --failfast authentik
 	coverage html
 	coverage report