diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
index aee8a55c17..228f01f8b2 100644
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -59,12 +59,6 @@ $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@echo "(re)installing $(GOBIN)/golangci-lint-v1.37.1"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.37.1 "github.com/golangci/golangci-lint/cmd/golangci-lint"
 
-GOVERAGE := $(GOBIN)/goverage-v0.0.0-20180129164344-eec3514a20b5
-$(GOVERAGE): $(BINGO_DIR)/goverage.mod
-	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/goverage-v0.0.0-20180129164344-eec3514a20b5"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=goverage.mod -o=$(GOBIN)/goverage-v0.0.0-20180129164344-eec3514a20b5 "github.com/haya14busa/goverage"
-
 GOX := $(GOBIN)/gox-v1.0.1
 $(GOX): $(BINGO_DIR)/gox.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
diff --git a/.bingo/goverage.mod b/.bingo/goverage.mod
deleted file mode 100644
index d3f4a0e39d..0000000000
--- a/.bingo/goverage.mod
+++ /dev/null
@@ -1,5 +0,0 @@
-module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
-
-go 1.16
-
-require github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5
diff --git a/.bingo/variables.env b/.bingo/variables.env
index acba65d052..684588cdb3 100644
--- a/.bingo/variables.env
+++ b/.bingo/variables.env
@@ -22,8 +22,6 @@ FLAEX="${GOBIN}/flaex-v0.2.1-0.20210701123229-9d7dceed124f"
 
 GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.37.1"
 
-GOVERAGE="${GOBIN}/goverage-v0.0.0-20180129164344-eec3514a20b5"
-
 GOX="${GOBIN}/gox-v1.0.1"
 
 HUGO="${GOBIN}/hugo-v0.87.0"
diff --git a/.make/go.mk b/.make/go.mk
index 31479626a3..4471c071af 100644
--- a/.make/go.mk
+++ b/.make/go.mk
@@ -16,9 +16,7 @@ else
 	GOBUILD ?= go build
 endif
 
-PACKAGES ?= $(shell go list ./...)
 SOURCES ?= $(shell find . -name "*.go" -type f -not -path "./node_modules/*")
-GENERATE ?= $(PACKAGES)
 
 TAGS ?=
 
@@ -78,16 +76,11 @@ ci-golangci-lint: $(GOLANGCI_LINT)
 	$(GOLANGCI_LINT) run -E gosec -E bodyclose -E dogsled -E durationcheck -E golint -E ifshort -E makezero -E prealloc -E predeclared --path-prefix $(NAME) --timeout 10m0s --issues-exit-code 0 --out-format checkstyle > checkstyle.xml
 
 .PHONY: test
-test: $(GOVERAGE)
-	@echo
-	@echo
-	@echo "$(NAME): test"
-	@echo
-	@$(GOVERAGE) -v -coverprofile coverage.out $(PACKAGES)
+test:
+	@go test -v -coverprofile coverage.out ./...
 
 .PHONY: go-coverage
 go-coverage:
-	@echo "$(NAME): go-coverage"
 	@if [ ! -f coverage.out ]; then $(MAKE) test  &>/dev/null; fi;
 	@go tool cover -func coverage.out | tail -1 | grep -Eo "[0-9]+\.[0-9]+"