diff --git a/pkg/daemons/control/server_test.go b/pkg/daemons/control/server_test.go
index 4c248a0153ba..7b003f8c780e 100644
--- a/pkg/daemons/control/server_test.go
+++ b/pkg/daemons/control/server_test.go
@@ -15,7 +15,6 @@ import (
 	"github.com/k3s-io/k3s/pkg/cluster"
 	"github.com/k3s-io/k3s/pkg/cluster/managed"
 	"github.com/k3s-io/k3s/pkg/daemons/config"
-	"github.com/k3s-io/k3s/pkg/daemons/control/deps"
 	"github.com/k3s-io/k3s/pkg/daemons/executor"
 	"github.com/k3s-io/k3s/pkg/etcd"
 	testutil "github.com/k3s-io/k3s/tests"
@@ -198,12 +197,8 @@ func mockControl(ctx context.Context, t *testing.T, clusterInit bool) (*config.C
 	testutil.GenerateRuntime(control)
 
 	control.Cluster = cluster.New(control)
-	if err := control.Cluster.Bootstrap(ctx, control.ClusterReset); err != nil {
-		return nil, pkgerrors.WithMessage(err, "failed to bootstrap cluster data")
-	}
-
-	if err := deps.GenServerDeps(control); err != nil {
-		return nil, pkgerrors.WithMessage(err, "failed to generate server dependencies")
+	if err := prepare(ctx, nil, control); err != nil {
+		return nil, pkgerrors.WithMessage(err, "failed to prepare cluster")
 	}
 
 	return control, nil
diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go
index b847946b5df4..12d4f1ed8f2c 100644
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -188,8 +188,7 @@ func (e *ETCD) SetControlConfig(config *config.Control) error {
 		return err
 	}
 	e.address = address
-
-	return e.setName(false)
+	return nil
 }
 
 // Test ensures that the local node is a voting member of the target cluster,