diff --git a/cmd/agent_test.go b/cmd/agent_test.go
index 5a7501b0..c381d6e0 100644
--- a/cmd/agent_test.go
+++ b/cmd/agent_test.go
@@ -33,7 +33,7 @@ func TestAgentRunOneShot(t *testing.T) {
 			"--agent-config-file=testdata/agent/one-shot/success/config.yaml",
 			"--input-path=testdata/agent/one-shot/success/input.json",
 			"--output-path=/dev/null",
-			"-v=1",
+			"-v=9",
 		}
 		Execute()
 		return
diff --git a/make/test-unit.mk b/make/test-unit.mk
index bba21cf0..8176c8b1 100644
--- a/make/test-unit.mk
+++ b/make/test-unit.mk
@@ -7,7 +7,7 @@ test-unit: | $(NEEDS_GO) $(NEEDS_GOTESTSUM) $(ARTIFACTS) $(NEEDS_ETCD) $(NEEDS_K
 		--junitfile=$(ARTIFACTS)/junit-go-e2e.xml \
 		-- \
 		-coverprofile=$(ARTIFACTS)/filtered.cov \
-		./api/... ./pkg/... \
+		./cmd/... ./api/... ./pkg/... \
 		-- \
 		-ldflags $(go_preflight_ldflags)
 
diff --git a/pkg/agent/run.go b/pkg/agent/run.go
index 6995c548..bef72cbe 100644
--- a/pkg/agent/run.go
+++ b/pkg/agent/run.go
@@ -32,7 +32,6 @@ import (
 
 	"github.com/jetstack/preflight/api"
 	"github.com/jetstack/preflight/pkg/client"
-	"github.com/jetstack/preflight/pkg/clusteruid"
 	"github.com/jetstack/preflight/pkg/datagatherer"
 	"github.com/jetstack/preflight/pkg/datagatherer/k8s"
 	"github.com/jetstack/preflight/pkg/kubeconfig"
@@ -79,28 +78,6 @@ func Run(cmd *cobra.Command, args []string) (returnErr error) {
 		return fmt.Errorf("While evaluating configuration: %v", err)
 	}
 
-	// We need the cluster UID before we progress further so it can be sent along with other data readings
-
-	{
-		restCfg, err := kubeconfig.LoadRESTConfig("")
-		if err != nil {
-			return err
-		}
-
-		clientset, err := kubernetes.NewForConfig(restCfg)
-		if err != nil {
-			return err
-		}
-
-		ctx, err = clusteruid.GetClusterUID(ctx, clientset)
-		if err != nil {
-			return fmt.Errorf("failed to get cluster UID: %v", err)
-		}
-
-		clusterUID := clusteruid.ClusterUIDFromContext(ctx)
-		log.V(logs.Debug).Info("Retrieved cluster UID", "clusterUID", clusterUID)
-	}
-
 	group, gctx := errgroup.WithContext(ctx)
 	defer func() {
 		cancel()