diff --git a/Makefile b/Makefile
index e72940e18..372370eb0 100644
--- a/Makefile
+++ b/Makefile
@@ -37,9 +37,13 @@ start:
 migrate:
 	$(GORUN) cmd/photoprism/photoprism.go migrate
 test:
-	$(GOTEST) -timeout 30m -v ./internal/...
+	$(GOTEST) -timeout 20m -v ./internal/...
+test-race:
+	$(GOTEST) -race -timeout 60m -v ./internal/...
 test-coverage:
-	$(GOTEST) -timeout 30m -race -coverprofile=coverage.txt -covermode=atomic -v ./internal/...
+	$(GOTEST) -timeout 30m -coverprofile=coverage.txt -covermode=atomic -v ./internal/...
+test-coverage-html:
+	$(GOTEST) -timeout 30m -coverprofile=coverage.txt -covermode=atomic -v ./internal/...
 	$(GOTOOL) cover -html=coverage.txt -o coverage.html
 clean:
 	$(GOCLEAN)
diff --git a/README.md b/README.md
index ae8e3fb2e..4db71292d 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,14 @@ PhotoPrism: Browse your life in pictures
 ========================================
 
 [![Apache License](https://img.shields.io/badge/license-apache-blue.svg)][license]
-[![Code Quality](https://goreportcard.com/badge/github.com/photoprism/photoprism)][code quality]
+[![Code Quality](https://goreportcard.com/badge/github.com/photoprism/photoprism)][quality]
+[![Test Coverage](https://codecov.io/gh/photoprism/photoprism/branch/develop/graph/badge.svg)][coverage]
 [![Build Status](https://travis-ci.org/photoprism/photoprism.png?branch=develop)][ci]
 [![Documentation](https://readthedocs.org/projects/photoprism-docs/badge/?version=latest&style=flat)][docs]
 
 [license]: https://github.com/photoprism/photoprism/blob/develop/LICENSE
-[code quality]: https://goreportcard.com/report/github.com/photoprism/photoprism
+[quality]: https://goreportcard.com/report/github.com/photoprism/photoprism
+[coverage]: https://codecov.io/gh/photoprism/photoprism
 [ci]: https://travis-ci.org/photoprism/photoprism
 [docs]: https://docs.photoprism.org/en/latest/