diff --git a/.travis.yml b/.travis.yml
index 8bf2f8c2feb..13f55f579a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -142,11 +142,11 @@ jobs:
 
     # Generators
     - os: linux
-      env: TARGETS="-C generator/metricbeat test"
+      env: TARGETS="-C generator/metricbeat test test-package"
       go: $TRAVIS_GO_VERSION
       stage: test
     - os: linux
-      env: TARGETS="-C generator/beat test"
+      env: TARGETS="-C generator/beat test test-package"
       go: $TRAVIS_GO_VERSION
       stage: test
 
diff --git a/generator/beat/{beat}/magefile.go b/generator/beat/{beat}/magefile.go
index d6321d26f3b..ede1bbf8ba4 100644
--- a/generator/beat/{beat}/magefile.go
+++ b/generator/beat/{beat}/magefile.go
@@ -77,3 +77,14 @@ func Build() error {
 func CrossBuild() error {
 	return build.CrossBuild()
 }
+
+// BuildGoDaemon builds the go-daemon binary (use crossBuildGoDaemon).
+func BuildGoDaemon() error {
+	return build.BuildGoDaemon()
+}
+
+// GolangCrossBuild build the Beat binary inside of the golang-builder.
+// Do not use directly, use crossBuild instead.
+func GolangCrossBuild() error {
+	return build.GolangCrossBuild()
+}
diff --git a/generator/common/Makefile b/generator/common/Makefile
index e880b412e32..5cd08aab8dc 100644
--- a/generator/common/Makefile
+++ b/generator/common/Makefile
@@ -24,6 +24,13 @@ test: prepare-test
 	$(MAKE) || exit 1 ; \
 	$(MAKE) unit
 
+.PHONY: test-package
+test-package: test
+	cd ${BEAT_PATH} ; \
+	export GOPATH=${PWD}/build ; \
+	export PATH=$${GOPATH}/bin:$${PATH}; \
+	mage package
+
 .PHONY: prepare-test
 prepare-test:: python-env
 	# Makes sure to use current version of beats for testing
diff --git a/generator/metricbeat/{beat}/magefile.go b/generator/metricbeat/{beat}/magefile.go
index a52bb547c1b..649cae97b76 100644
--- a/generator/metricbeat/{beat}/magefile.go
+++ b/generator/metricbeat/{beat}/magefile.go
@@ -112,3 +112,14 @@ func Build() error {
 func CrossBuild() error {
 	return build.CrossBuild()
 }
+
+// BuildGoDaemon builds the go-daemon binary (use crossBuildGoDaemon).
+func BuildGoDaemon() error {
+	return build.BuildGoDaemon()
+}
+
+// GolangCrossBuild build the Beat binary inside of the golang-builder.
+// Do not use directly, use crossBuild instead.
+func GolangCrossBuild() error {
+	return build.GolangCrossBuild()
+}