diff --git a/cluster/etcd_elector_test.go b/cluster/etcd_elector_test.go
index 59cd25606..999a3d791 100644
--- a/cluster/etcd_elector_test.go
+++ b/cluster/etcd_elector_test.go
@@ -44,7 +44,7 @@ func TestEtcdElector(t *testing.T) {
 
 	etcdCfg, cleanup, err := etcd.NewEmbeddedEtcdInstance(tmpDir, 0, 0, "")
 	require.NoError(t, err)
-	defer cleanup()
+	t.Cleanup(cleanup)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()