diff --git a/docs/data/elasticsearch/generated/errors.json b/docs/data/elasticsearch/generated/errors.json
index 041a2eebf68..84ce2e17d4f 100644
--- a/docs/data/elasticsearch/generated/errors.json
+++ b/docs/data/elasticsearch/generated/errors.json
@@ -9,7 +9,7 @@
             "id": "container-id"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "error": {
             "grouping_key": "d6b3f958dfea98dc9ed2b57d5f0c48bb",
@@ -106,7 +106,7 @@
             "id": "container-id"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "error": {
             "culprit": "my.module.function_name",
@@ -420,7 +420,7 @@
             "id": "container-id"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "error": {
             "exception": [
@@ -507,7 +507,7 @@
             "id": "container-id"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "error": {
             "exception": [
diff --git a/docs/data/elasticsearch/generated/metricsets.json b/docs/data/elasticsearch/generated/metricsets.json
index 025d4726f28..3a3e3f8b507 100644
--- a/docs/data/elasticsearch/generated/metricsets.json
+++ b/docs/data/elasticsearch/generated/metricsets.json
@@ -6,7 +6,7 @@
             "version": "3.14.0"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "event": {
             "ingested": "2020-04-22T14:55:05.425020Z"
@@ -71,7 +71,7 @@
         },
         "double_gauge": 3.141592653589793,
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "event": {
             "ingested": "2020-04-22T14:55:05.368308Z"
diff --git a/docs/data/elasticsearch/generated/spans.json b/docs/data/elasticsearch/generated/spans.json
index 788cc4795b5..69ea7b3d0e6 100644
--- a/docs/data/elasticsearch/generated/spans.json
+++ b/docs/data/elasticsearch/generated/spans.json
@@ -6,7 +6,7 @@
             "version": "3.14.0"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "event": {
             "outcome": "unknown"
@@ -122,7 +122,7 @@
             "port": 5432
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "event": {
             "outcome": "unknown"
@@ -191,7 +191,7 @@
             "version": "3.14.0"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "event": {
             "outcome": "unknown"
@@ -244,7 +244,7 @@
             "version": "3.14.0"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "event": {
             "outcome": "unknown"
@@ -303,7 +303,7 @@
             ]
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "event": {
             "outcome": "unknown"
diff --git a/docs/data/elasticsearch/generated/transactions.json b/docs/data/elasticsearch/generated/transactions.json
index 024ab9d4273..7a395fddb29 100644
--- a/docs/data/elasticsearch/generated/transactions.json
+++ b/docs/data/elasticsearch/generated/transactions.json
@@ -9,7 +9,7 @@
             "id": "container-id"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "event": {
             "ingested": "2020-08-11T09:55:04.391451Z",
@@ -105,7 +105,7 @@
             "id": "container-id"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "event": {
             "ingested": "2020-08-11T09:55:04.391568Z",
@@ -201,7 +201,7 @@
             "id": "container-id"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "event": {
             "ingested": "2020-08-11T09:55:04.391639Z",
@@ -309,7 +309,7 @@
             "id": "container-id"
         },
         "ecs": {
-            "version": "1.5.0"
+            "version": "1.6.0"
         },
         "event": {
             "ingested": "2020-08-11T09:55:04.338986Z",
diff --git a/publish/pub_test.go b/publish/pub_test.go
index e385f3aa2ec..7f4856d96c1 100644
--- a/publish/pub_test.go
+++ b/publish/pub_test.go
@@ -25,6 +25,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"go.elastic.co/apm/apmtest"
+
 	"github.com/elastic/beats/v7/libbeat/beat"
 	"github.com/elastic/beats/v7/libbeat/common"
 	"github.com/elastic/beats/v7/libbeat/outputs"
@@ -32,7 +34,6 @@ import (
 	"github.com/elastic/beats/v7/libbeat/publisher/pipeline"
 	"github.com/elastic/beats/v7/libbeat/publisher/queue"
 	"github.com/elastic/beats/v7/libbeat/publisher/queue/memqueue"
-	"go.elastic.co/apm/apmtest"
 
 	"github.com/elastic/apm-server/publish"
 	"github.com/elastic/apm-server/transform"
diff --git a/tests/system/test_aggregation.py b/tests/system/test_aggregation.py
index 3f7351b0a35..2a132cb5372 100644
--- a/tests/system/test_aggregation.py
+++ b/tests/system/test_aggregation.py
@@ -65,5 +65,5 @@ def test_transaction_metrics_flushed_shutdown(self):
         self.load_docs_with_template(self.get_payload_path("transactions_spans.ndjson"),
                                      self.intake_url, 'transaction', 9)
         self.assert_no_logged_warnings()
-        self.apmserver_proc.kill() # Stop server to ensure metrics are flushed on shutdown
+        self.apmserver_proc.kill()  # Stop server to ensure metrics are flushed on shutdown
         self.wait_for_events('metric', 3, index=index_metric)