diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 04b04d9e80..c6b06ba224 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,13 +17,13 @@ repos:
             )$
 
 -   repo: git://github.com/dnephin/pre-commit-golang
-    rev: v0.3.4
+    rev: v0.3.5
     hooks:
     -   id: go-fmt
     -   id: go-lint
-    -   id: go-vet
     -   id: no-go-testing
     -   id: golangci-lint
+        args: ["--fix", "--fast", "--new"]
 
 -   repo: git@github.com:elastic/apm-pipeline-library
     rev: current
@@ -44,4 +44,7 @@ repos:
     -   id: remove-en-dashes
     -   id: check-jjbb
     -   id: check-gherkin-lint
-        args: ["--disable", "AvoidOutlineForSingleExample,TooClumsy,TooLongStep,TooManyDifferentTags,TooManySteps"]
+        args: [
+            "--disable", "AvoidOutlineForSingleExample,TooClumsy,TooLongStep,TooManyDifferentTags,TooManySteps",
+            "e2e/_suites/**/*.feature",
+        ]
diff --git a/.vscode/launch.json b/.vscode/launch.json
index ed845a6435..d4c4b46bca 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "program": "${workspaceFolder}/cli",
             "env": {
                 "GO111MODULE": "on",
-                "OP_LOG_LEVEL": "DEBUG",
+                "OP_LOG_LEVEL": "DEBUG"
             },
             "args": ["run", "-h"]
         },
@@ -21,7 +21,7 @@
             "program": "${workspaceFolder}/cli",
             "env": {
                 "GO111MODULE": "on",
-                "OP_LOG_LEVEL": "DEBUG",
+                "OP_LOG_LEVEL": "DEBUG"
             },
             "args": ["sync", "integrations", "--remote", "elastic:master"]
         },
@@ -33,7 +33,7 @@
             "program": "${workspaceFolder}/cli",
             "env": {
                 "GO111MODULE": "on",
-                "OP_LOG_LEVEL": "DEBUG",
+                "OP_LOG_LEVEL": "DEBUG"
             },
             "args": ["run", "service", "mysql", "--version", "5.6"]
         },
@@ -45,7 +45,7 @@
             "program": "${workspaceFolder}/cli",
             "env": {
                 "GO111MODULE": "on",
-                "OP_LOG_LEVEL": "DEBUG",
+                "OP_LOG_LEVEL": "DEBUG"
             },
             "args": ["stop", "service", "mysql", "--version", "5.6"]
         },
@@ -57,7 +57,7 @@
             "program": "${workspaceFolder}/cli",
             "env": {
                 "GO111MODULE": "on",
-                "OP_LOG_LEVEL": "DEBUG",
+                "OP_LOG_LEVEL": "DEBUG"
             },
             "args": ["deploy", "redis", "--version", "4.0.11", "--profile", "metricbeat"]
         },
@@ -69,7 +69,7 @@
             "program": "${workspaceFolder}/cli",
             "env": {
                 "GO111MODULE": "on",
-                "OP_LOG_LEVEL": "DEBUG",
+                "OP_LOG_LEVEL": "DEBUG"
             },
             "args": ["undeploy", "redis", "--profile", "metricbeat"]
         },
@@ -81,7 +81,7 @@
             "program": "${workspaceFolder}/cli",
             "env": {
                 "GO111MODULE": "on",
-                "OP_LOG_LEVEL": "DEBUG",
+                "OP_LOG_LEVEL": "DEBUG"
             },
             "args": ["run", "profile", "metricbeat", "-v", "7.5.0", "--withServices", "apache:2.2,redis:3.2.12"]
         },
@@ -93,7 +93,7 @@
             "program": "${workspaceFolder}/cli",
             "env": {
                 "GO111MODULE": "on",
-                "OP_LOG_LEVEL": "DEBUG",
+                "OP_LOG_LEVEL": "DEBUG"
             },
             "args": ["stop", "profile", "metricbeat"]
         },
@@ -105,7 +105,7 @@
             "program": "${file}",
             "env": {
                 "GO111MODULE": "on",
-                "OP_LOG_LEVEL": "DEBUG",
+                "OP_LOG_LEVEL": "DEBUG"
             },
             "args": ["--godog.format", "pretty", "metricbeat"]
         }
diff --git a/cli/Building.md b/cli/Building.md
index 3bae645116..9e3473701e 100644
--- a/cli/Building.md
+++ b/cli/Building.md
@@ -7,4 +7,4 @@ The `build-cli.sh` script builds the binary based on a few environment variables
 $ GOOS=("darwin" "linux" "windows") ./.ci/scripts/build-cli.sh
 # and/or
 $ GOARCH=("386" "amd64") ./.ci/scripts/build-cli.sh
-```
\ No newline at end of file
+```
diff --git a/cli/LICENSE.txt b/cli/LICENSE.txt
index f2c80bdf43..52406b601a 100644
--- a/cli/LICENSE.txt
+++ b/cli/LICENSE.txt
@@ -1,3 +1,3 @@
 Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 or more contributor license agreements. Licensed under the Elastic License;
-you may not use this file except in compliance with the Elastic License.
\ No newline at end of file
+you may not use this file except in compliance with the Elastic License.
diff --git a/doc.go b/doc.go
new file mode 100644
index 0000000000..526ee16820
--- /dev/null
+++ b/doc.go
@@ -0,0 +1,5 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License;
+// you may not use this file except in compliance with the Elastic License.
+
+package main
diff --git a/e2e/LICENSE.txt b/e2e/LICENSE.txt
index f2c80bdf43..52406b601a 100644
--- a/e2e/LICENSE.txt
+++ b/e2e/LICENSE.txt
@@ -1,3 +1,3 @@
 Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 or more contributor license agreements. Licensed under the Elastic License;
-you may not use this file except in compliance with the Elastic License.
\ No newline at end of file
+you may not use this file except in compliance with the Elastic License.
diff --git a/e2e/_suites/metricbeat/configurations/vsphere.yml b/e2e/_suites/metricbeat/configurations/vsphere.yml
index a0b489fbd2..6299cfc407 100644
--- a/e2e/_suites/metricbeat/configurations/vsphere.yml
+++ b/e2e/_suites/metricbeat/configurations/vsphere.yml
@@ -9,4 +9,4 @@ metricbeat.modules:
     hosts: ["https://vsphere:443/sdk"]
     username: "user"
     password: "pass"
-    insecure: true
\ No newline at end of file
+    insecure: true
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000000..38e69233f2
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module github.com/elastic/e2e-testing
+
+go 1.14
diff --git a/notice/NOTICE.txt.tmpl b/notice/NOTICE.txt.tmpl
index 02c7db8900..f10274e294 100644
--- a/notice/NOTICE.txt.tmpl
+++ b/notice/NOTICE.txt.tmpl
@@ -27,4 +27,4 @@ Third party libraries used by the Elastic Beats project:
 Indirect dependencies
 
 {{ template "depInfo" .Indirect }}
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/notice/rules.json b/notice/rules.json
index e201a07f3e..b3729d9373 100644
--- a/notice/rules.json
+++ b/notice/rules.json
@@ -15,4 +15,4 @@
         "EPL-1.0",
         "GPL-3.0"
     ]
-}
\ No newline at end of file
+}