diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d1667c60..2d0788ee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
 
       mysql:
-        image: mysql:5.7
+        image: mysql:8
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: false
           MYSQL_ROOT_PASSWORD: password
@@ -65,7 +65,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
       mysql2:
-        image: mysql:5.7
+        image: mysql:8
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: false
           MYSQL_ROOT_PASSWORD: password
diff --git a/tests/TenantDatabaseManagerTest.php b/tests/TenantDatabaseManagerTest.php
index 99d9c4f8..5419c45d 100644
--- a/tests/TenantDatabaseManagerTest.php
+++ b/tests/TenantDatabaseManagerTest.php
@@ -305,7 +305,7 @@ test('database credentials can be provided to PermissionControlledMySQLDatabaseM
     $password = Str::random('8');
     $mysql2DB = DB::connection('mysql2');
     $mysql2DB->statement("CREATE USER `{$username}`@`%` IDENTIFIED BY '{$password}';");
-    $mysql2DB->statement("GRANT ALL PRIVILEGES ON *.* TO `{$username}`@`%` identified by '{$password}' WITH GRANT OPTION;");
+    $mysql2DB->statement("GRANT ALL PRIVILEGES ON *.* TO `{$username}`@`%` WITH GRANT OPTION;");
     $mysql2DB->statement("FLUSH PRIVILEGES;");
 
     DB::purge('mysql2'); // forget the mysql2 connection so that it uses the new credentials the next time
@@ -350,7 +350,7 @@ test('tenant database can be created by using the username and password from ten
     $password = Str::random('8');
     $mysqlDB = DB::connection('mysql');
     $mysqlDB->statement("CREATE USER `{$username}`@`%` IDENTIFIED BY '{$password}';");
-    $mysqlDB->statement("GRANT ALL PRIVILEGES ON *.* TO `{$username}`@`%` identified by '{$password}' WITH GRANT OPTION;");
+    $mysqlDB->statement("GRANT ALL PRIVILEGES ON *.* TO `{$username}`@`%` WITH GRANT OPTION;");
     $mysqlDB->statement("FLUSH PRIVILEGES;");
 
     DB::purge('mysql2'); // forget the mysql2 connection so that it uses the new credentials the next time