diff --git a/.travis.yml b/.travis.yml
index ef23f37614..2d3e56f47e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,11 +35,8 @@ services:
   - mysql
   - memcached
 
-before_install:
-  - travis/setup-mysql8.sh $MYSQL8
-
 install:
-  - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION ${NOTESTS:-0} ${MYSQL8:-0}
 
 before_script:
   - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
diff --git a/travis/setup-mysql8.sh b/travis/setup-mysql8.sh
index 8450d8d6c7..3fb16e5159 100755
--- a/travis/setup-mysql8.sh
+++ b/travis/setup-mysql8.sh
@@ -11,13 +11,6 @@
 set -e
 set -x
 
-MYSQL8=$1
-
-if [ "$MYSQL8" != '1' ]
-then
-	exit 0
-fi
-
 wget https://repo.mysql.com//mysql-apt-config_0.8.15-1_all.deb
 sudo dpkg -i mysql-apt-config_0.8.15-1_all.deb
 sudo apt-get update -q
diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh
index be9eb703d5..0fcb63c311 100755
--- a/travis/setup-phpbb.sh
+++ b/travis/setup-phpbb.sh
@@ -14,6 +14,7 @@ set -x
 DB=$1
 TRAVIS_PHP_VERSION=$2
 NOTESTS=$3
+MYSQL8=$4
 
 if [ "$NOTESTS" == '1' ]
 then
@@ -26,6 +27,11 @@ then
 	travis/setup-mariadb.sh
 fi
 
+if [ "$MYSQL8" == '1' ]
+then
+	travis/setup-mysql8.sh
+fi
+
 if [ "$NOTESTS" != '1' ]
 then
 	travis/setup-php-extensions.sh