4 files changed, 13 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 1497964..c454751 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 config.yml
+cover.out
 tmp/*
 .idea
 *.log
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d54fa1c..cc5aff5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,6 +57,9 @@ go:1.13:
 go:1.14:
   extends: .test
   image: golang:1.14
+  after_script:
+    - make coverage
+  coverage: '/\d+.\d+%/'
 
 race:
   extends: .test
diff --git a/Makefile b/Makefile
index 5c2a8f1..5cffe76 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: validate verify verify_ruby verify_golang test test_ruby test_golang setup _install build compile check clean
+.PHONY: validate verify verify_ruby verify_golang test test_ruby test_golang coverage coverage_golang setup _install build compile check clean
 
 GO_SOURCES := $(shell find . -name '*.go')
 
@@ -19,11 +19,16 @@ test_ruby:
 	bundle exec rspec --color --format d spec
 
 test_golang:
-	go test ./...
+	go test -cover -coverprofile=cover.out ./...
 
 test_golang_race:
 	go test -race ./...
 
+coverage: coverage_golang
+
+coverage_golang:
+	[ -f cover.out ] && go tool cover -func cover.out
+
 setup: _install bin/gitlab-shell
 
 _install:
diff --git a/README.md b/README.md
index 05c3560..531a074 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,8 @@ plan](https://gitlab.com/gitlab-org/gitaly/issues/1226#note_126519133).
 
 ## Code status
 
-[![pipeline status](https://gitlab.com/gitlab-org/gitlab-shell/badges/master/pipeline.svg)](https://gitlab.com/gitlab-org/gitlab-shell/commits/master)
-[![coverage report](https://gitlab.com/gitlab-org/gitlab-shell/badges/master/coverage.svg)](https://gitlab.com/gitlab-org/gitlab-shell/commits/master)
+[![pipeline status](https://gitlab.com/gitlab-org/gitlab-shell/badges/master/pipeline.svg)](https://gitlab.com/gitlab-org/gitlab-shell/-/pipelines?ref=master)
+[![coverage report](https://gitlab.com/gitlab-org/gitlab-shell/badges/master/coverage.svg)](https://gitlab.com/gitlab-org/gitlab-shell/-/pipelines?ref=master)
 [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlab-shell.svg)](https://codeclimate.com/github/gitlabhq/gitlab-shell)
 
 ## Requirements