diff --git a/mysql-test/suite/plugins/r/cracklib_password_check.result b/mysql-test/suite/plugins/r/cracklib_password_check.result
index fabad23ff45..62f0e32b66a 100644
--- a/mysql-test/suite/plugins/r/cracklib_password_check.result
+++ b/mysql-test/suite/plugins/r/cracklib_password_check.result
@@ -31,12 +31,6 @@ show warnings;
 Level	Code	Message
 Warning	1819	cracklib: it does not contain enough DIFFERENT characters
 Error	1819	Your password does not satisfy the current policy requirements
-grant select on *.* to foo@foobar identified by 'foobar';
-ERROR HY000: Your password does not satisfy the current policy requirements
-show warnings;
-Level	Code	Message
-Warning	1819	cracklib: it is based on your username
-Error	1819	Your password does not satisfy the current policy requirements
 grant select on *.* to foobar identified by 'qwerty';
 ERROR HY000: Your password does not satisfy the current policy requirements
 show warnings;
diff --git a/mysql-test/suite/plugins/t/cracklib_password_check.test b/mysql-test/suite/plugins/t/cracklib_password_check.test
index 177a77956b4..a8f404009d0 100644
--- a/mysql-test/suite/plugins/t/cracklib_password_check.test
+++ b/mysql-test/suite/plugins/t/cracklib_password_check.test
@@ -23,10 +23,6 @@ show warnings;
 grant select on *.* to foo@barbar identified by 'barbar';
 show warnings;
 
---error ER_NOT_VALID_PASSWORD
-grant select on *.* to foo@foobar identified by 'foobar';
-show warnings;
-
 --error ER_NOT_VALID_PASSWORD
 grant select on *.* to foobar identified by 'qwerty';
 show warnings;