diff --git a/.travis.yml b/.travis.yml
index 3d79d156de..ae5afc33d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ php:
   - hhvm
 
 env:
-  - DB=mysql
+  - DB=mysqli
 
 services:
   - redis-server
@@ -22,10 +22,12 @@ before_script:
 script:
   - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION
   - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
 
 matrix:
   include:
+    - php: 5.4
+      env: DB=mysql
     - php: 5.4
       env: DB=mariadb
     - php: 5.4
diff --git a/travis/phing-sniff.sh b/travis/phing-sniff.sh
index 1473b99da4..04118af69a 100755
--- a/travis/phing-sniff.sh
+++ b/travis/phing-sniff.sh
@@ -9,7 +9,7 @@ set -x
 DB=$1
 TRAVIS_PHP_VERSION=$2
 
-if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysql" ]
+if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
 then
 	cd build
 	../phpBB/vendor/bin/phing sniff
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
index 60c279d774..21122ccaeb 100644
--- a/travis/phpunit-mysql-travis.xml
+++ b/travis/phpunit-mysql-travis.xml
@@ -17,9 +17,6 @@
 			<exclude>../tests/functional</exclude>
 			<exclude>../tests/lint_test.php</exclude>
 		</testsuite>
-		<testsuite name="phpBB Lint Test">
-			<file>../tests/lint_test.php</file>
-		</testsuite>
 		<testsuite name="phpBB Functional Tests">
 			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
 		</testsuite>
@@ -32,7 +29,7 @@
 	</groups>
 
 	<php>
-		<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysqli" />
+		<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysql" />
 		<server name="PHPBB_TEST_DBHOST" value="0.0.0.0" />
 		<server name="PHPBB_TEST_DBPORT" value="3306" />
 		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
diff --git a/travis/phpunit-mysqli-travis.xml b/travis/phpunit-mysqli-travis.xml
new file mode 100644
index 0000000000..60c279d774
--- /dev/null
+++ b/travis/phpunit-mysqli-travis.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="true"
+         backupStaticAttributes="true"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="true"
+         strict="true"
+         verbose="true"
+         bootstrap="../tests/bootstrap.php">
+	<testsuites>
+		<testsuite name="phpBB Test Suite">
+			<directory suffix="_test.php">../tests</directory>
+			<exclude>../tests/functional</exclude>
+			<exclude>../tests/lint_test.php</exclude>
+		</testsuite>
+		<testsuite name="phpBB Lint Test">
+			<file>../tests/lint_test.php</file>
+		</testsuite>
+		<testsuite name="phpBB Functional Tests">
+			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
+		</testsuite>
+	</testsuites>
+
+	<groups>
+		<exclude>
+			<group>slow</group>
+		</exclude>
+	</groups>
+
+	<php>
+		<server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysqli" />
+		<server name="PHPBB_TEST_DBHOST" value="0.0.0.0" />
+		<server name="PHPBB_TEST_DBPORT" value="3306" />
+		<server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
+		<server name="PHPBB_TEST_DBUSER" value="root" />
+		<server name="PHPBB_TEST_DBPASSWD" value="" />
+		<server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
+		<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
+		<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
+	</php>
+</phpunit>
diff --git a/travis/setup-database.sh b/travis/setup-database.sh
index c1917042cd..8c19086191 100755
--- a/travis/setup-database.sh
+++ b/travis/setup-database.sh
@@ -15,12 +15,12 @@ then
 	psql -c 'create database phpbb_tests;' -U postgres
 fi
 
-if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysql" ]
+if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
 then
 	mysql -e 'SET GLOBAL storage_engine=MyISAM;'
 fi
 
-if [ "$DB" == "mysql" -o "$DB" == "mariadb" ]
+if [ "$DB" == "mysql" -o "$DB" == "mysqli" -o "$DB" == "mariadb" ]
 then
 	mysql -e 'create database IF NOT EXISTS phpbb_tests;'
 fi