diff --git a/t/pt-show-grants/all_grants.t b/t/pt-show-grants/all_grants.t
index 0123c303..d986dffd 100644
--- a/t/pt-show-grants/all_grants.t
+++ b/t/pt-show-grants/all_grants.t
@@ -54,16 +54,16 @@ $output = output(
 
 my $expected_80 = <<'END_OUTPUT_0';
 -- Grants for 'bob'@'%'
-CREATE USER IF NOT EXISTS 'bob'@'%';
-ALTER USER 'bob'@'%' IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT;
+CREATE USER IF NOT EXISTS `bob`@`%`;
+ALTER USER `bob`@`%` IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
 GRANT USAGE ON *.* TO `bob`@`%`;
 -- Grants for 'bob'@'192.168.1.1'
-CREATE USER IF NOT EXISTS 'bob'@'192.168.1.1';
-ALTER USER 'bob'@'192.168.1.1' IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT;
+CREATE USER IF NOT EXISTS `bob`@`192.168.1.1`;
+ALTER USER `bob`@`192.168.1.1` IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
 GRANT USAGE ON *.* TO `bob`@`192.168.1.1`;
 -- Grants for 'bob'@'localhost'
-CREATE USER IF NOT EXISTS 'bob'@'localhost';
-ALTER USER 'bob'@'localhost' IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT;
+CREATE USER IF NOT EXISTS `bob`@`localhost`;
+ALTER USER `bob`@`localhost` IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
 GRANT USAGE ON *.* TO `bob`@`localhost`;
 END_OUTPUT_0
 
@@ -105,8 +105,8 @@ $output = output(
 
 $expected_80 = <<'END_OUTPUT_5';
 -- Grants for 'bob'@'192.168.1.1'
-CREATE USER IF NOT EXISTS 'bob'@'192.168.1.1';
-ALTER USER 'bob'@'192.168.1.1' IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT;
+CREATE USER IF NOT EXISTS `bob`@`192.168.1.1`;
+ALTER USER `bob`@`192.168.1.1` IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
 GRANT USAGE ON *.* TO `bob`@`192.168.1.1`;
 END_OUTPUT_5
 
diff --git a/t/pt-show-grants/samples/column-grants-80.txt b/t/pt-show-grants/samples/column-grants-80.txt
index 26077b99..b0271c16 100644
--- a/t/pt-show-grants/samples/column-grants-80.txt
+++ b/t/pt-show-grants/samples/column-grants-80.txt
@@ -1,6 +1,6 @@
 -- Grants for 'sally'@'%'
-CREATE USER IF NOT EXISTS 'sally'@'%';
-ALTER USER 'sally'@'%' IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT;
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
 GRANT INSERT (`city`), SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;
 GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
 GRANT USAGE ON *.* TO `sally`@`%`;
diff --git a/t/pt-show-grants/samples/column-grants-combined-80.txt b/t/pt-show-grants/samples/column-grants-combined-80.txt
index 5deb94db..4f2d35bb 100644
--- a/t/pt-show-grants/samples/column-grants-combined-80.txt
+++ b/t/pt-show-grants/samples/column-grants-combined-80.txt
@@ -1,6 +1,6 @@
 -- Grants for 'sally'@'%'
-CREATE USER IF NOT EXISTS 'sally'@'%';
-ALTER USER 'sally'@'%' IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT;
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
 GRANT INSERT (`city`), SELECT, SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;
 GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
 GRANT USAGE ON *.* TO `sally`@`%`;
diff --git a/t/pt-show-grants/samples/column-grants-separate-80.txt b/t/pt-show-grants/samples/column-grants-separate-80.txt
index 708fa8c9..b8dfed80 100644
--- a/t/pt-show-grants/samples/column-grants-separate-80.txt
+++ b/t/pt-show-grants/samples/column-grants-separate-80.txt
@@ -1,6 +1,6 @@
 -- Grants for 'sally'@'%'
-CREATE USER IF NOT EXISTS 'sally'@'%';
-ALTER USER 'sally'@'%' IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT;
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
 GRANT INSERT (`city`) ON `sakila`.`city` TO `sally`@`%`;
 GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
 GRANT SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;
diff --git a/t/pt-show-grants/samples/column-grants-separate-revoke-80.txt b/t/pt-show-grants/samples/column-grants-separate-revoke-80.txt
index 400b26b8..a465089b 100644
--- a/t/pt-show-grants/samples/column-grants-separate-revoke-80.txt
+++ b/t/pt-show-grants/samples/column-grants-separate-revoke-80.txt
@@ -4,8 +4,8 @@ REVOKE SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`
 REVOKE SELECT (`city_id`) ON `sakila`.`city` FROM `sally`@`%`;
 REVOKE USAGE ON *.* FROM `sally`@`%`;
 -- Grants for 'sally'@'%'
-CREATE USER IF NOT EXISTS 'sally'@'%';
-ALTER USER 'sally'@'%' IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT;
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'mysql_native_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
 GRANT INSERT (`city`) ON `sakila`.`city` TO `sally`@`%`;
 GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
 GRANT SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;