diff --git a/Makefile b/Makefile
index 605b320fb3..3e6e0600cf 100644
--- a/Makefile
+++ b/Makefile
@@ -310,9 +310,11 @@ benchmark:
 ###############################################################################
 
 lint:
-	golangci-lint run --out-format=tab --issues-exit-code=0
-	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs gofmt -d -s
-.PHONY: lint
+	golangci-lint run --out-format=tab
+
+lint-fix:
+	golangci-lint run --fix --out-format=tab --issues-exit-code=0
+.PHONY: lint lint-fix
 
 format:
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name '*.pb.go' | xargs gofmt -w -s
diff --git a/x/staking/types/test_utils.go b/x/staking/types/data_test.go
similarity index 95%
rename from x/staking/types/test_utils.go
rename to x/staking/types/data_test.go
index 9ab8aabfe8..377d7f8844 100644
--- a/x/staking/types/test_utils.go
+++ b/x/staking/types/data_test.go
@@ -7,7 +7,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-// nolint:deadcode,unused
 var (
 	pk1      = ed25519.GenPrivKey().PubKey()
 	pk2      = ed25519.GenPrivKey().PubKey()