diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac38f62..d7c530f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,15 +40,6 @@ code_coverage:
   script:
   - make coverage
 
-code_coverage_report:
-  stage: test
-  tags:
-  - docker
-  script:
-  - make coverhtml
-  only:
-  - master
-
 lint_code:
   stage: test
   tags:
diff --git a/Makefile b/Makefile
index 726fe43..4d0ab83 100644
--- a/Makefile
+++ b/Makefile
@@ -17,13 +17,11 @@ race: dep ## Run data race detector
 	@go test -race ${PKG_LIST}
 
 msan: dep ## Run memory sanitizer
-	@go test -msan ${PKG_LIST}
+	@go test -msan -short ${PKG_LIST}
 
 coverage: ## Generate global code coverage report
-	./tools/coverage.sh;
-
-coverhtml: ## Generate global code coverage report in HTML
-	./tools/coverage.sh html;
+	mkdir -p cover
+	go tool cover -html=cover/gonextcloud.cov -o coverage.html
 
 dep: ## Get the dependencies
 	mkdir -p vendor