diff --git a/.travis.yml b/.travis.yml
index a3171ff7061..82f87c1e08e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -149,20 +149,20 @@ jobs:
 
     # Generators
     - os: linux
-      env: TARGETS="-C generator/metricbeat test test-package"
+      env: TARGETS="-C generator/_templates/metricbeat test test-package"
       go: $TRAVIS_GO_VERSION
       stage: test
     - os: linux
-      env: TARGETS="-C generator/beat test test-package"
+      env: TARGETS="-C generator/_templates/beat test test-package"
       go: $TRAVIS_GO_VERSION
       stage: test
 
     - os: osx
-      env: TARGETS="-C generator/metricbeat test"
+      env: TARGETS="-C generator/_templates/metricbeat test"
       go: $TRAVIS_GO_VERSION
       stage: test
     - os: osx
-      env: TARGETS="-C generator/beat test"
+      env: TARGETS="-C generator/_templates/beat test"
       go: $TRAVIS_GO_VERSION
       stage: test
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 161f3f60df5..446dfe576d8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -471,28 +471,28 @@ pipeline {
           stages {
             stage('Generators Metricbeat Linux'){
               steps {
-                makeTarget("Generators Metricbeat Linux", "-C generator/metricbeat test")
-                makeTarget("Generators Metricbeat Linux", "-C generator/metricbeat test-package")
+                makeTarget("Generators Metricbeat Linux", "-C generator/_templates/metricbeat test")
+                makeTarget("Generators Metricbeat Linux", "-C generator/_templates/metricbeat test-package")
               }
             }
             stage('Generators Beat Linux'){
               steps {
-                makeTarget("Generators Beat Linux", "-C generator/beat test")
-                makeTarget("Generators Beat Linux", "-C generator/beat test-package")
+                makeTarget("Generators Beat Linux", "-C generator/_templates/beat test")
+                makeTarget("Generators Beat Linux", "-C generator/_templates/beat test-package")
               }
             }
             stage('Generators Metricbeat Mac OS X'){
               agent { label 'macosx' }
               options { skipDefaultCheckout() }
               steps {
-                makeTarget("Generators Metricbeat Mac OS X", "-C generator/metricbeat test")
+                makeTarget("Generators Metricbeat Mac OS X", "-C generator/_templates/metricbeat test")
               }
             }
             stage('Generators Beat Mac OS X'){
               agent { label 'macosx' }
               options { skipDefaultCheckout() }
               steps {
-                makeTarget("Generators Beat Mac OS X", "-C generator/beat test")
+                makeTarget("Generators Beat Mac OS X", "-C generator/_templates/beat test")
               }
             }
           }
diff --git a/dev-tools/jenkins_ci.ps1 b/dev-tools/jenkins_ci.ps1
index 87093208055..9d43fef5c9b 100755
--- a/dev-tools/jenkins_ci.ps1
+++ b/dev-tools/jenkins_ci.ps1
@@ -32,7 +32,7 @@ $env:TEST_COVERAGE = "true"
 $env:RACE_DETECTOR = "true"
 
 # Install mage from vendor.
-exec { go install github.com/elastic/beats/vendor/github.com/magefile/mage } "mage install FAILURE"
+exec { go install -mod=vendor github.com/magefile/mage } "mage install FAILURE"
 
 if (Test-Path "$env:beat\magefile.go") {
     cd "$env:beat"
diff --git a/generator/_templates/beat/Makefile b/generator/_templates/beat/Makefile
index dd1e5be8557..7c476dc5f6e 100644
--- a/generator/_templates/beat/Makefile
+++ b/generator/_templates/beat/Makefile
@@ -1 +1 @@
-include ../common/Makefile
+include ../../common/Makefile
diff --git a/generator/_templates/metricbeat/Makefile b/generator/_templates/metricbeat/Makefile
index c773d75926c..d58cf4922bb 100644
--- a/generator/_templates/metricbeat/Makefile
+++ b/generator/_templates/metricbeat/Makefile
@@ -1,6 +1,6 @@
 BEAT_TYPE       = metricbeat
 
-include ../common/Makefile
+include ../../common/Makefile
 
 # Collects all dependencies and then calls update
 .PHONY: collect