diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result
index d49b9daee85f23caedcc23643b920a076bf5c0a0..0b1271885868422a1c0288f5782bf1aa700649c6 100644
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/r/grant2.result
@@ -7,7 +7,7 @@ current_user()
 mysqltest_1@localhost
 grant all privileges on `my\_1`.* to mysqltest_2@localhost with grant option;
 grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option;
-ERROR 42000: Access denied for user: 'mysqltest_1@localhost' to database 'my_%'
+ERROR 42000: Access denied for user: 'mysqltest_1'@'localhost' to database 'my_%'
 show grants for mysqltest_1@localhost;
 Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test
index 3fbe2b0fe585d299b1c4065600a31655a2e3cb00..148c4d3da214d3dc619c6368a75ac722855354ba 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/t/grant2.test
@@ -19,8 +19,7 @@ grant all privileges on `my\_1`.* to mysqltest_2@localhost with grant option;
 --error 1044
 grant all privileges on `my_%`.* to mysqltest_3@localhost with grant option;
 disconnect user1;
-connect (root,localhost,root,,);
-connection root;
+connection default;
 show grants for mysqltest_1@localhost;
 show grants for mysqltest_2@localhost;
 --error 1141