diff --git a/generator/_templates/beat/{beat}/tools/tools.go b/generator/_templates/beat/{beat}/tools/tools.go
index 289a0a2cb705..9b553081ae36 100644
--- a/generator/_templates/beat/{beat}/tools/tools.go
+++ b/generator/_templates/beat/{beat}/tools/tools.go
@@ -5,9 +5,11 @@
 package tools
 
 import (
+	_ "github.com/magefile/mage"
 	_ "github.com/pierrre/gotestcover"
 	_ "github.com/tsg/go-daemon"
 	_ "golang.org/x/tools/cmd/goimports"
+	_ "gotest.tools/gotestsum/cmd"
 
 	_ "github.com/mitchellh/gox"
 	_ "golang.org/x/lint/golint"
diff --git a/generator/_templates/metricbeat/{beat}/tools/tools.go b/generator/_templates/metricbeat/{beat}/tools/tools.go
index 289a0a2cb705..9b553081ae36 100644
--- a/generator/_templates/metricbeat/{beat}/tools/tools.go
+++ b/generator/_templates/metricbeat/{beat}/tools/tools.go
@@ -5,9 +5,11 @@
 package tools
 
 import (
+	_ "github.com/magefile/mage"
 	_ "github.com/pierrre/gotestcover"
 	_ "github.com/tsg/go-daemon"
 	_ "golang.org/x/tools/cmd/goimports"
+	_ "gotest.tools/gotestsum/cmd"
 
 	_ "github.com/mitchellh/gox"
 	_ "golang.org/x/lint/golint"
diff --git a/generator/common/Makefile b/generator/common/Makefile
index 8d82a444e84c..97f845d4b0d4 100644
--- a/generator/common/Makefile
+++ b/generator/common/Makefile
@@ -22,6 +22,7 @@ test: prepare-test
 test-package: test
 	cd ${BEAT_PATH} ; \
 	export PATH=$${GOPATH}/bin:$${PATH}; \
+	go mod tidy && \
 	mage package
 
 .PHONY: prepare-test