diff --git a/.gitignore b/.gitignore
index a2b235f95..de73354e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@
 playground/
 kopia-*.tar.gz
 kopia-*.zip
-combined.cov
+*.cov
 .vscode/
diff --git a/Makefile b/Makefile
index 41f6e319e..2615c34f1 100644
--- a/Makefile
+++ b/Makefile
@@ -90,4 +90,9 @@ godoc:
 	godoc -http=:33333
 
 coverage:
-	./coverage.sh
+	test --coverprofile tmp.cov github.com/kopia/kopia/...
+	go tool cover -html=tmp.cov
+
+coverage-repo:
+	go test --coverprofile tmp.cov github.com/kopia/kopia/block/... github.com/kopia/kopia/object/... github.com/kopia/kopia/repo/...
+	go tool cover -html=tmp.cov
diff --git a/coverage.sh b/coverage.sh
deleted file mode 100755
index 515ce4783..000000000
--- a/coverage.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-echo mode: set > combined.cov
-for p in `go list github.com/kopia/kopia/...`; do
-    go test --coverprofile tmp.cov $p
-    grep -v "mode: " tmp.cov >> combined.cov
-    rm tmp.cov
-done
-go tool cover -html=combined.cov
-rm combined.cov