diff --git a/Changes b/Changes
index 459f79a..73b2f43 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,8 @@
 Revision history for Perl extension Test::mysqld.
 
 {{$NEXT}}
+
+1.0030 2024-04-06T14:22:15Z
     - Support DBD::MariaDB
 
 1.0020 2024-04-05T16:35:54Z
diff --git a/META.json b/META.json
index 5c3e3aa..7215cc8 100644
--- a/META.json
+++ b/META.json
@@ -73,7 +73,7 @@
          "web" : "https://github.com/kazuho/p5-test-mysqld"
       }
    },
-   "version" : "1.0020",
+   "version" : "1.0030",
    "x_authority" : "cpan:KAZUHO",
    "x_contributors" : [
       "David Steinbrunner <dsteinbrunner@pobox.com>",
@@ -85,11 +85,11 @@
       "John Napiorkowski <jjn1056@yahoo.com>",
       "Kazuho Oku <kazuho@li1.kazuhooku.com>",
       "Kazuho Oku <kazuhooku@gmail.com>",
+      "Masayuki Matsuki <y.songmu@gmail.com>",
       "Matthew Horsfall <wolfsage@gmail.com>",
       "NAKAGAWA Masaki <masaki.nakagawa@gmail.com>",
       "Naoto Nakamura <naoto.nakamura@showroom.co.jp>",
       "Petr Písař <ppisar@redhat.com>",
-      "Songmu <y.songmu@gmail.com>",
       "Yoshikazu Sawa <883514+yoshikazusawa@users.noreply.github.com>",
       "Yusuke Watase <ywatase@gmail.com>",
       "Zhenjun Wang <zjwang0414@gmail.com>",
diff --git a/author/ci_install_mysql.sh b/author/ci_install_mysql.sh
index 5fb1ea6..1e3a7e4 100755
--- a/author/ci_install_mysql.sh
+++ b/author/ci_install_mysql.sh
@@ -11,9 +11,8 @@ if [[ $DATABASE_ADAPTER =~ (mariadb|mysql-(5\.7|8\.0)) ]]; then
     sudo apt-get update -q
     sudo apt-get install -q --yes --force-yes -f --option DPkg::Options::=--force-confnew mariadb-server libmariadb-dev
     sudo mariadb-upgrade
-  elif [[ $DATABASE_ADAPTER =~ mysql-(5\.7|8\.0) ]]; then
+  elif [[ $DATABASE_ADAPTER =~ mysql-5\.7 ]]; then
     sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 467B942D3A79BD29
-    # XXX: The switch to mysql 5.7 is not currently working....
     cat <<EOC | sudo debconf-set-selections
 mysql-apt-config mysql-apt-config/select-server select $DATABASE_ADAPTER
 mysql-apt-config mysql-apt-config/repo-codename select bionic
@@ -22,6 +21,8 @@ EOC
     wget https://dev.mysql.com/get/mysql-apt-config_0.8.29-1_all.deb
     sudo dpkg --install mysql-apt-config_0.8.29-1_all.deb
     sudo apt-get update -q
-    sudo apt-get install -q --yes --option Dpkg::Options::=--force-confnew mysql-server libmysqlclient-dev
+    sudo apt-cache policy mysql-server
+    sudo apt-get remove --yes mysql-client-8.0 mysql-client-core-8.0
+    sudo apt-get install -q --yes -f --option DPkg::Options::=--force-confnew mysql-client=5.7* mysql-community-server=5.7* mysql-server=5.7*
   fi
 fi
diff --git a/lib/Test/mysqld.pm b/lib/Test/mysqld.pm
index 458830f..ba39690 100644
--- a/lib/Test/mysqld.pm
+++ b/lib/Test/mysqld.pm
@@ -26,7 +26,7 @@ if ($@) {
     }
 }
 
-our $VERSION = '1.0020';
+our $VERSION = '1.0030';
 
 our $errstr;
 our @SEARCH_PATHS = qw(/usr/local/mysql);