diff --git a/dev-tools/mage/integtest.go b/dev-tools/mage/integtest.go
index f4b7f0f17d0..41219d58d6c 100644
--- a/dev-tools/mage/integtest.go
+++ b/dev-tools/mage/integtest.go
@@ -195,7 +195,7 @@ func runInIntegTestEnv(mageTarget string, test func() error, passThroughEnvVars
 		"-e", "TESTING_ENVIRONMENT=" + StackEnvironment,
 	}
 	if UseVendor {
-		args = append(args, "--env", "GOFLAGS=-mod=vendor")
+		args = append(args, "-e", "GOFLAGS=-mod=vendor")
 	}
 	args, err = addUidGidEnvArgs(args)
 	if err != nil {
diff --git a/x-pack/metricbeat/module/aws/vpc/vpc_integration_test.go b/x-pack/metricbeat/module/aws/vpc/vpc_integration_test.go
index c3bc08bdeda..f19007fa369 100644
--- a/x-pack/metricbeat/module/aws/vpc/vpc_integration_test.go
+++ b/x-pack/metricbeat/module/aws/vpc/vpc_integration_test.go
@@ -10,9 +10,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/elastic/beats/libbeat/common"
-	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
-	"github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest"
+	"github.com/elastic/beats/v7/libbeat/common"
+	mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
+	"github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/mtest"
 )
 
 func TestData(t *testing.T) {
diff --git a/x-pack/metricbeat/module/aws/vpc/vpc_test.go b/x-pack/metricbeat/module/aws/vpc/vpc_test.go
index 634c4ce09cd..a073ee8447f 100644
--- a/x-pack/metricbeat/module/aws/vpc/vpc_test.go
+++ b/x-pack/metricbeat/module/aws/vpc/vpc_test.go
@@ -7,11 +7,11 @@ package vpc
 import (
 	"os"
 
-	"github.com/elastic/beats/metricbeat/mb"
+	"github.com/elastic/beats/v7/metricbeat/mb"
 
 	// Register input module and metricset
-	_ "github.com/elastic/beats/x-pack/metricbeat/module/aws"
-	_ "github.com/elastic/beats/x-pack/metricbeat/module/aws/cloudwatch"
+	_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws"
+	_ "github.com/elastic/beats/v7/x-pack/metricbeat/module/aws/cloudwatch"
 )
 
 func init() {
diff --git a/x-pack/metricbeat/module/redisenterprise/fields.go b/x-pack/metricbeat/module/redisenterprise/fields.go
index 7695ff24329..d2382b42571 100644
--- a/x-pack/metricbeat/module/redisenterprise/fields.go
+++ b/x-pack/metricbeat/module/redisenterprise/fields.go
@@ -7,7 +7,7 @@
 package redisenterprise
 
 import (
-	"github.com/elastic/beats/libbeat/asset"
+	"github.com/elastic/beats/v7/libbeat/asset"
 )
 
 func init() {
diff --git a/x-pack/metricbeat/module/redisenterprise/node/node_integration_test.go b/x-pack/metricbeat/module/redisenterprise/node/node_integration_test.go
index 3eda84a1cf1..8c061d57176 100644
--- a/x-pack/metricbeat/module/redisenterprise/node/node_integration_test.go
+++ b/x-pack/metricbeat/module/redisenterprise/node/node_integration_test.go
@@ -13,11 +13,11 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/elastic/beats/libbeat/tests/compose"
-	"github.com/elastic/beats/metricbeat/mb"
-	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
-	_ "github.com/elastic/beats/metricbeat/module/prometheus"
-	_ "github.com/elastic/beats/metricbeat/module/prometheus/collector"
+	"github.com/elastic/beats/v7/libbeat/tests/compose"
+	"github.com/elastic/beats/v7/metricbeat/mb"
+	mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
+	_ "github.com/elastic/beats/v7/metricbeat/module/prometheus"
+	_ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector"
 )
 
 func init() {
diff --git a/x-pack/metricbeat/module/redisenterprise/node/node_test.go b/x-pack/metricbeat/module/redisenterprise/node/node_test.go
index 153a589d7a6..72a3c5af282 100644
--- a/x-pack/metricbeat/module/redisenterprise/node/node_test.go
+++ b/x-pack/metricbeat/module/redisenterprise/node/node_test.go
@@ -10,13 +10,13 @@ import (
 	"os"
 	"testing"
 
-	"github.com/elastic/beats/libbeat/logp"
-	"github.com/elastic/beats/metricbeat/mb"
-	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
+	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/elastic/beats/v7/metricbeat/mb"
+	mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
 
 	// Register input module and metricset
-	_ "github.com/elastic/beats/metricbeat/module/prometheus"
-	_ "github.com/elastic/beats/metricbeat/module/prometheus/collector"
+	_ "github.com/elastic/beats/v7/metricbeat/module/prometheus"
+	_ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector"
 )
 
 func init() {
diff --git a/x-pack/metricbeat/module/redisenterprise/proxy/proxy_integration_test.go b/x-pack/metricbeat/module/redisenterprise/proxy/proxy_integration_test.go
index f103b99ee32..756f6ce864b 100644
--- a/x-pack/metricbeat/module/redisenterprise/proxy/proxy_integration_test.go
+++ b/x-pack/metricbeat/module/redisenterprise/proxy/proxy_integration_test.go
@@ -13,11 +13,11 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/elastic/beats/libbeat/tests/compose"
-	"github.com/elastic/beats/metricbeat/mb"
-	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
-	_ "github.com/elastic/beats/metricbeat/module/prometheus"
-	_ "github.com/elastic/beats/metricbeat/module/prometheus/collector"
+	"github.com/elastic/beats/v7/libbeat/tests/compose"
+	"github.com/elastic/beats/v7/metricbeat/mb"
+	mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
+	_ "github.com/elastic/beats/v7/metricbeat/module/prometheus"
+	_ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector"
 )
 
 func init() {
diff --git a/x-pack/metricbeat/module/redisenterprise/proxy/proxy_test.go b/x-pack/metricbeat/module/redisenterprise/proxy/proxy_test.go
index fb68fdbeb12..7da64bbfc54 100644
--- a/x-pack/metricbeat/module/redisenterprise/proxy/proxy_test.go
+++ b/x-pack/metricbeat/module/redisenterprise/proxy/proxy_test.go
@@ -10,13 +10,13 @@ import (
 	"os"
 	"testing"
 
-	"github.com/elastic/beats/libbeat/logp"
-	"github.com/elastic/beats/metricbeat/mb"
-	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
+	"github.com/elastic/beats/v7/libbeat/logp"
+	"github.com/elastic/beats/v7/metricbeat/mb"
+	mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
 
 	// Register input module and metricset
-	_ "github.com/elastic/beats/metricbeat/module/prometheus"
-	_ "github.com/elastic/beats/metricbeat/module/prometheus/collector"
+	_ "github.com/elastic/beats/v7/metricbeat/module/prometheus"
+	_ "github.com/elastic/beats/v7/metricbeat/module/prometheus/collector"
 )
 
 func init() {