diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f8ddd86d..e5b08f97 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -92,7 +92,7 @@ jobs:
       run: make build
 
     - name: Unit Tests
-      run: make test-unit
+      run: make test-unit-cover
 
     - name: Cache unit coverage report
       uses: actions/cache/save@v4
diff --git a/Makefile b/Makefile
index ec68f6cd..b6fa2929 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,10 @@ SQLC_MIGRATION_FIX = pkg/db/migrations/postgres/000000_sqlc_fix.sql
 EXTRA_BUILD_FLAGS ?=
 
 test-unit:
-	env GOFLAGS="-mod=vendor" CGO_ENABLED=0 go test -short -coverprofile=coverage_unit.out ./...
+	@env GOFLAGS="-mod=vendor" CGO_ENABLED=0 go test -short
+
+test-unit-cover:
+	@env GOFLAGS="-mod=vendor" CGO_ENABLED=0 go test -short -coverprofile=coverage_unit.out -coverpkg=$(shell go list ./... | paste -sd, -) ./...
 
 bench-unit:
 	env GOFLAGS="-mod=vendor" CGO_ENABLED=0 go test -bench=. -benchtime=20s -short ./...
@@ -25,7 +28,7 @@ vendors:
 build: build-server build-loadtest build-view-emails build-view-widget build-puzzledbg
 
 build-tests:
-	env GOFLAGS="-mod=vendor" CGO_ENABLED=0 go test -c -cover -covermode=atomic $(EXTRA_BUILD_FLAGS) -o tests/ $(shell go list $(EXTRA_BUILD_FLAGS) -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' ./...)
+	env GOFLAGS="-mod=vendor" CGO_ENABLED=0 go test -c -cover -covermode=atomic $(EXTRA_BUILD_FLAGS) -o tests/ $(shell go list $(EXTRA_BUILD_FLAGS) -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' -coverpkg=$(shell go list $(EXTRA_BUILD_FLAGS) ./... | paste -sd, -) ./...)
 
 build-tests-ee: EXTRA_BUILD_FLAGS = -tags enterprise
 build-tests-ee: build-tests
diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test
index eac06dfb..f8223c07 100644
--- a/docker/Dockerfile.test
+++ b/docker/Dockerfile.test
@@ -14,7 +14,7 @@ ARG EXTRA_BUILD_FLAGS=
 ARG GO_LDFLAGS="-s -w"
 RUN --mount=type=cache,target=/cache/gomod --mount=type=cache,target=/cache/gobuild,sharing=locked env GOFLAGS="-mod=vendor" CGO_ENABLED=0 go build -C cmd/server -ldflags="${GO_LDFLAGS} -X main.GitCommit=${GIT_COMMIT}" ${EXTRA_BUILD_FLAGS} -o ../../bin/server
 
-RUN --mount=type=cache,target=/cache/gomod --mount=type=cache,target=/cache/gobuild,sharing=locked env GOFLAGS="-mod=vendor" CGO_ENABLED=0 go test -c -cover -covermode=atomic ${EXTRA_BUILD_FLAGS} -o tests/ $(go list ${EXTRA_BUILD_FLAGS} -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' ./...)
+RUN --mount=type=cache,target=/cache/gomod --mount=type=cache,target=/cache/gobuild,sharing=locked env GOFLAGS="-mod=vendor" CGO_ENABLED=0 go test -c -cover -covermode=atomic ${EXTRA_BUILD_FLAGS} -o tests/ $(go list ${EXTRA_BUILD_FLAGS} -f '{{if .TestGoFiles}}{{.ImportPath}}{{end}}' -coverpkg=$(shell go list ./... | paste -sd, -) ./...)
 
 FROM debian:stable-slim