diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 4d2460dc4e7..e1fc4caf720 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -616,6 +616,8 @@ static int run_mysqlcheck_upgrade(void)
                   "--check-upgrade",
                   "--all-databases",
                   "--auto-repair",
+                  "--fix-db-names",
+                  "--fix-table-names",
                   NULL);
 }