diff --git a/Makefile b/Makefile
index 422c4cf2..9370f737 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ setup-dev-env:
 .PHONY: verify
 verify: ## verify athens codebase
 	./scripts/check_gofmt.sh
-	./scripts/check_golint.sh
+	./scripts/check_govet.sh
 	./scripts/check_deps.sh
 	./scripts/check_conflicts.sh
 
diff --git a/pkg/stash/with_etcd.go b/pkg/stash/with_etcd.go
index 26203e10..3ce65771 100644
--- a/pkg/stash/with_etcd.go
+++ b/pkg/stash/with_etcd.go
@@ -29,10 +29,13 @@ func WithEtcd(endpoints []string, checker storage.Checker) (Wrapper, error) {
 	}
 	var eg errgroup.Group
 	for _, ep := range endpoints {
-		eg.Go(func() error {
-			_, err := c.Status(ctx, ep)
-			return err
-		})
+		epStat := func(ep string) func() error {
+			return func() error {
+				_, err := c.Status(ctx, ep)
+				return err
+			}
+		}(ep)
+		eg.Go(epStat)
 	}
 	err = eg.Wait()
 	if err != nil {
diff --git a/scripts/check_golint.sh b/scripts/check_govet.sh
similarity index 57%
rename from scripts/check_golint.sh
rename to scripts/check_govet.sh
index 60d0cf60..4f139895 100755
--- a/scripts/check_golint.sh
+++ b/scripts/check_govet.sh
@@ -4,4 +4,4 @@
 # Run the linter on everything except generated code
 set -euo pipefail
 
-golint -set_exit_status $(GO111MODULE=off go list ./... | grep -v '/mocks')
+go vet ./...