diff --git a/buildout/mysql-instance/buildout.cfg b/buildout/mysql-instance/buildout.cfg
index 42116f629c7e9ee039a903bdc0699b1798e8520c..7d177aba322d78432de40d18cc1797c27e8acc4d 100644
--- a/buildout/mysql-instance/buildout.cfg
+++ b/buildout/mysql-instance/buildout.cfg
@@ -9,7 +9,6 @@ parts =
     mysql-bin
     mysql-admin
     mysql_install_db
-    mycnf
     mysqld-bin
 
 [ports]
@@ -52,4 +51,5 @@ datadir=${buildout:mysql_datadir}
 pid=${:datadir}/mysql.pid
 err = ${buildout:directory}/var/mysql.err.log
 sock = ${:datadir}/mysql.sock
-opt = --port=${ports:mysql} --pid-file=${:pid} --log-error=${:err} --basedir=${:basedir} --datadir=${:datadir} --socket=${:sock} --no-defaults
+mysql_opt = --no-defaults -P ${ports:mysql} -S ${mycnf:sock}
+mysqld_opt = --no-defaults --port=${ports:mysql} --pid-file=${:pid} --log-error=${:err} --basedir=${:basedir} --datadir=${:datadir} --socket=${:sock}
diff --git a/buildout/mysql-instance/templates/mysql.in b/buildout/mysql-instance/templates/mysql.in
index 70cc30df6df416b83dcf9ca174e15015f89db550..68241e23d1386ee0c99a328ebcb349391dee33dc 100755
--- a/buildout/mysql-instance/templates/mysql.in
+++ b/buildout/mysql-instance/templates/mysql.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysql -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*
+${software_definition:mysql_software}/bin/mysql ${mycnf:mysql_opt} $@
diff --git a/buildout/mysql-instance/templates/mysqladmin.in b/buildout/mysql-instance/templates/mysqladmin.in
index 1fbc9bae9d84d68790556d27e234bdaf242491cb..3dfa8a84cf4967438e4aa6be015a04b15c3544f7 100755
--- a/buildout/mysql-instance/templates/mysqladmin.in
+++ b/buildout/mysql-instance/templates/mysqladmin.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqladmin -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*
+${software_definition:mysql_software}/bin/mysqladmin ${mycnf:mysql_opt} $@
diff --git a/buildout/mysql-instance/templates/mysqld.in b/buildout/mysql-instance/templates/mysqld.in
index 2ff13369fe00f1091343cd36e7a64b70fe9113b4..1c2e0e0044c2fefefa343c2bf920421b74cb3ac6 100755
--- a/buildout/mysql-instance/templates/mysqld.in
+++ b/buildout/mysql-instance/templates/mysqld.in
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqld_safe ${mycnf:opt}
+${software_definition:mysql_software}/bin/mysqld_safe ${mycnf:mysqld_opt}