diff --git a/libbeat/publisher/pipeline/pipeline_test.go b/libbeat/publisher/pipeline/pipeline_test.go
index 5cee672ce747..977c6b31d1ff 100644
--- a/libbeat/publisher/pipeline/pipeline_test.go
+++ b/libbeat/publisher/pipeline/pipeline_test.go
@@ -98,8 +98,7 @@ func makeDiscardQueue() queue.Queue {
 			// count is a counter that increments on every published event
 			// it's also the returned Event ID
 			count := uint64(0)
-			var producer *testProducer
-			producer = &testProducer{
+			producer := &testProducer{
 				publish: func(try bool, event interface{}) (queue.EntryID, bool) {
 					count++
 					return queue.EntryID(count), true
diff --git a/x-pack/filebeat/input/entityanalytics/internal/kvstore/input.go b/x-pack/filebeat/input/entityanalytics/internal/kvstore/input.go
index 3677054818b0..8b9828980dbb 100644
--- a/x-pack/filebeat/input/entityanalytics/internal/kvstore/input.go
+++ b/x-pack/filebeat/input/entityanalytics/internal/kvstore/input.go
@@ -68,7 +68,7 @@ func (n *input) Run(runCtx v2.Context, connector beat.PipelineConnector) (err er
 		EventListener: NewTxACKHandler(),
 	})
 	if err != nil {
-		return fmt.Errorf("could not connect to publishing pipeline: %s", err)
+		return fmt.Errorf("could not connect to publishing pipeline: %w", err)
 	}
 	defer client.Close()