diff --git a/.gitignore b/.gitignore
index c1161c27bc..f47994d2b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 .DS_Store
 .fseventsd
 .envrc
+.gotools
 .vagrant/
 .idea/
 /pkg
diff --git a/GNUmakefile b/GNUmakefile
index e24e30d4f9..6e7ea22cc4 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -330,7 +330,11 @@ static-assets:
 ui: ui-docker static-assets-docker
 
 tools:
-	go get -v $(GOTOOLS)
+	@mkdir -p .gotools
+	@cd .gotools && if [[ ! -f go.mod ]]; then \
+		go mod init consul-tools ; \
+	fi
+	cd .gotools && go get -v $(GOTOOLS)
 
 version:
 	@echo -n "Version:                    "