diff --git a/mysql-test/r/acl_roles_set_role-recursive.result b/mysql-test/r/acl_roles_set_role-recursive.result
index 50a7f8494ba..e7ebd77fbb0 100644
--- a/mysql-test/r/acl_roles_set_role-recursive.result
+++ b/mysql-test/r/acl_roles_set_role-recursive.result
@@ -38,9 +38,8 @@ set role test_role1;
 show grants;
 Grants for test_user@localhost
 GRANT USAGE ON *.* TO 'test_user'@'localhost'
-select * from mysql.roles_mapping;
+select * from mysql.roles_mapping where HostFk='';
 HostFk	UserFk	RoleFk
-localhost	test_user	test_role1
 	test_role1	test_role2
 show grants;
 Grants for test_user@localhost
@@ -68,9 +67,8 @@ set role test_role1;
 show grants;
 Grants for test_user@localhost
 GRANT USAGE ON *.* TO 'test_user'@'localhost'
-select * from mysql.roles_mapping;
+select * from mysql.roles_mapping where HostFk='';
 HostFk	UserFk	RoleFk
-localhost	test_user	test_role1
 	test_role1	test_role2
 show grants;
 Grants for test_user@localhost
diff --git a/mysql-test/t/acl_roles_set_role-recursive.test b/mysql-test/t/acl_roles_set_role-recursive.test
index 983dbb8e1e5..9bf8bdaf8e9 100644
--- a/mysql-test/t/acl_roles_set_role-recursive.test
+++ b/mysql-test/t/acl_roles_set_role-recursive.test
@@ -31,7 +31,7 @@ select * from mysql.roles_mapping;
 show grants;
 set role test_role1;
 show grants;
-select * from mysql.roles_mapping;
+select * from mysql.roles_mapping where HostFk='';
 
 show grants;
 set role none;
@@ -50,7 +50,7 @@ select * from mysql.roles_mapping;
 show grants;
 set role test_role1;
 show grants;
-select * from mysql.roles_mapping;
+select * from mysql.roles_mapping where HostFk='';
 
 show grants;
 set role none;