diff --git a/.travis.yml b/.travis.yml
index 54ea5a84aaa..cf8719a97de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -236,11 +236,17 @@ before_script:
       mysql -u root -e "CREATE USER 'root'@'127.0.0.1' IDENTIFIED WITH mysql_native_password BY 'password'; FLUSH PRIVILEGES;"
       mysql -u root -e "ALTER USER 'root'@'127.0.0.1' IDENTIFIED WITH mysql_native_password BY 'password'; FLUSH PRIVILEGES;"
       mysql -u root -e "ALTER USER 'travis'@'127.0.0.1' IDENTIFIED WITH mysql_native_password BY 'password'; FLUSH PRIVILEGES;"
+      mysql -u root -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'password'; FLUSH PRIVILEGES;"
+      mysql -u root -e "ALTER USER 'travis'@'localhost' IDENTIFIED WITH mysql_native_password BY 'password'; FLUSH PRIVILEGES;"
+      mysql -u root -e "ALTER USER 'travis'@'%' IDENTIFIED WITH mysql_native_password BY 'password'; FLUSH PRIVILEGES;"
       echo "MySQL grant"
       mysql -u root -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
       echo "MySQL grant and flush"
       mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* TO root@127.0.0.1; FLUSH PRIVILEGES;'
+      sudo sed -i -e 's/default-authentication-plugin=.*/default-authentication-plugin=mysql_native_password/g' /etc/mysql/mysql.conf.d/mysqld.conf
+      sudo cat /etc/mysql/mysql.conf
       sudo /etc/init.d/mysql restart
+      sudo mysqladmin variables | grep default_authentication_plugin
       echo "MySQL list current users"
       mysql -u root -e 'use mysql; select * from user;'
       set -e