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