diff --git a/.circleci/config.yml b/.circleci/config.yml
index cb810905a..a465fd97a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -94,7 +94,7 @@ jobs:
       - run: git submodule sync
       - run: git submodule update --init
       - gomod
-      - run: go test -v ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg=all
+      - run: go test -v ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg=./pkg...,./cli/...
       - codecov/upload:
           file: coverage.txt
 
diff --git a/.travis.yml b/.travis.yml
index c6c715776..1efe14318 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ install:
   - go mod tidy -v
 script:
   - golint -set_exit_status ./...
-  - go test -v -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=all ./...
+  - go test -v -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=./pkg/...,./cli/... ./...
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 matrix:
diff --git a/Makefile b/Makefile
index 8d422d062..50c944628 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ fmt:
 	@gofmt -l -w -s $$(find . -type f -name '*.go'| grep -v "/vendor/")
 
 cover:
-	@go test -v -race ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg=all
+	@go test -v -race ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg=./pkg/...,./cli/...
 	@go tool cover -html=coverage.txt -o coverage.html
 
 # --- Environment ---