diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dddc3f..6d970bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,6 +91,8 @@ test:test-coverage:
     - make coverage_report
     - make coverage_html
   allow_failure: true
+  after_script:
+    - bash <(curl -s https://codecov.io/bash) -t $CODECOV_TOKEN
   artifacts:
     paths:
     - ./coverage.html
diff --git a/Makefile b/Makefile
index f498bb4..4834d1d 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ show_tests:
 
 # Run unittests
 test:
-	@go test -v ./...
+	@go test -v -coverprofile=coverage.txt -covermode=atomic ./...
 
 # Run data race detector
 race:
@@ -39,7 +39,7 @@ msan:
 
 # Generate global code coverage report
 coverage:
-	@go test -coverprofile=coverage.out ./...
+	@go test -coverprofile=coverage.out -covermode=atomic ./...
 
 # Generate code coverage report
 coverage_report: