diff --git a/mysql-test/r/federated_server.result b/mysql-test/r/federated_server.result
index 43a99454e1e..7a1a6e0970d 100644
--- a/mysql-test/r/federated_server.result
+++ b/mysql-test/r/federated_server.result
@@ -49,7 +49,6 @@ SOCKET '',
 OWNER 'root');
 select * from mysql.servers;
 Server_name	Host	Db	Username	Password	Port	Socket	Wrapper	Owner
-test	localhost	test	root		0		mysql	root
 server_one	127.0.0.1	first_db	root		SLAVE_PORT		mysql	root
 server_two	127.0.0.1	second_db	root		SLAVE_PORT		mysql	root
 DROP TABLE IF EXISTS federated.old;
@@ -101,7 +100,6 @@ drop server 'server_one';
 drop server 'server_two';
 select * from mysql.servers;
 Server_name	Host	Db	Username	Password	Port	Socket	Wrapper	Owner
-test	localhost	test	root		0		mysql	root
 drop table first_db.t1;
 drop table second_db.t1;
 drop database first_db;
diff --git a/mysql-test/r/rpl_read_only.result b/mysql-test/r/rpl_read_only.result
index 0b06a3d414a..2e1d482341f 100644
--- a/mysql-test/r/rpl_read_only.result
+++ b/mysql-test/r/rpl_read_only.result
@@ -4,6 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+create user test;
 create table t1(a int) engine=InnoDB;
 create table t2(a int) engine=MyISAM;
 insert into t1 values(1001);
@@ -109,5 +110,6 @@ insert into t1 values(1006);
 ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
 insert into t2 values(2006);
 ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement
+drop user test;
 drop table t1;
 drop table t2;
diff --git a/mysql-test/r/rpl_row_USER.result b/mysql-test/r/rpl_row_USER.result
index c061ccbdc62..328148d7588 100644
--- a/mysql-test/r/rpl_row_USER.result
+++ b/mysql-test/r/rpl_row_USER.result
@@ -22,15 +22,15 @@ CALL mysqltest1.p1();
 SELECT * FROM mysqltest1.t1 ORDER BY a;
 a	users
 1	tester@localhost
-2	@localhost
+2	@localhost%
 3	tester@localhost
-4	@localhost
+4	@localhost%
 SELECT * FROM mysqltest1.t1 ORDER BY a;
 a	users
 1	tester@localhost
-2	@localhost
+2	@localhost%
 3	tester@localhost
-4	@localhost
+4	@localhost%
 DROP DATABASE mysqltest1;
 REVOKE ALL ON mysqltest1.* FROM 'tester'@'%';
 REVOKE ALL ON mysqltest1.* FROM ''@'localhost%';
diff --git a/mysql-test/t/ndb_multi_row.test b/mysql-test/t/ndb_multi_row.test
index 05a0944e99a..632a9fda89a 100644
--- a/mysql-test/t/ndb_multi_row.test
+++ b/mysql-test/t/ndb_multi_row.test
@@ -23,8 +23,8 @@ select * from t2;
 show status like 'handler_discover%';
 
 # Check dropping and recreating table on same server
-connect (con1,localhost,,,test);
-connect (con2,localhost,,,test);
+connect (con1,localhost,root,,test);
+connect (con2,localhost,root,,test);
 connection con1;
 select * from t1;
 connection con2;
diff --git a/mysql-test/t/rpl_read_only.test b/mysql-test/t/rpl_read_only.test
index 659c3d10044..aec32245057 100644
--- a/mysql-test/t/rpl_read_only.test
+++ b/mysql-test/t/rpl_read_only.test
@@ -2,6 +2,11 @@
 -- source include/master-slave.inc
 -- source include/have_innodb.inc
 
+# Create a test and replicate it to slave
+connection master;
+create user test;
+sync_slave_with_master;
+
 # Setting the master readonly :
 # - the variable @@readonly is not replicated on the slave
 
@@ -99,6 +104,7 @@ insert into t2 values(2006);
 
 ## Cleanup
 connection master;
+drop user test;
 drop table t1;
 drop table t2;
 sync_slave_with_master;