diff --git a/mysql-test/main/set_password.result b/mysql-test/main/set_password.result
index 518d07490c173..e578339731d53 100644
--- a/mysql-test/main/set_password.result
+++ b/mysql-test/main/set_password.result
@@ -58,7 +58,6 @@ current_user()
 oldpassold@localhost
 disconnect con;
 connection default;
-flush privileges;
 connect con,localhost,natauth,test,;
 select current_user();
 current_user()
@@ -140,7 +139,6 @@ current_user()
 oldpassold@localhost
 disconnect con;
 connection default;
-flush privileges;
 connect con,localhost,natauth,test2,;
 select current_user();
 current_user()
diff --git a/mysql-test/main/set_password.test b/mysql-test/main/set_password.test
index 9e65623153254..76dcb4872c234 100644
--- a/mysql-test/main/set_password.test
+++ b/mysql-test/main/set_password.test
@@ -45,6 +45,7 @@ select current_user();
 --connect(con,localhost,newpassnat,test,)
 select current_user();
 --disconnect con
+--disable_view_protocol
 --connect(con,localhost,oldauth,test,,,,auth=mysql_old_password:mysql_native_password)
 select current_user();
 --disconnect con
@@ -54,11 +55,10 @@ select current_user();
 --connect(con,localhost,oldpassold,test,,,,auth=mysql_old_password:mysql_native_password)
 select current_user();
 --disconnect con
+--enable_view_protocol
 
 --connection default
 
-flush privileges;
-
 --connect(con,localhost,natauth,test,)
 select current_user();
 --disconnect con
@@ -68,6 +68,7 @@ select current_user();
 --connect(con,localhost,newpassnat,test,)
 select current_user();
 --disconnect con
+--disable_view_protocol
 --connect(con,localhost,oldauth,test,,,,auth=mysql_old_password:mysql_native_password)
 select current_user();
 --disconnect con
@@ -77,6 +78,7 @@ select current_user();
 --connect(con,localhost,oldpassold,test,,,,auth=mysql_old_password:mysql_native_password)
 select current_user();
 --disconnect con
+--enable_view_protocol
 
 --connection default
 
@@ -112,8 +114,6 @@ select current_user();
 
 --connection default
 
-flush privileges;
-
 --connect(con,localhost,natauth,test2,)
 select current_user();
 --disconnect con