diff --git a/.travis.yml b/.travis.yml
index cb3e764..fe445ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,21 @@
 language: php
 
 php:
-  - hhvm
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
+  - "7.2"
+  - "7.1"
+  - "7.0"
 
 env:
   - MW=master
+  - MW=REL1_32
+  - MW=REL1_31
 
 matrix:
   include:
-  - php: 7.1
-    env: MW=REL1_28
-  - php: 7.1
+  - php: "7.1"
+    env: MW=REL1_27
+  - php: "5.5"
     env: MW=REL1_27
-  - php: 7.1
-    env: MW=REL1_26
-  - php: 7.1
-    env: MW=REL1_25
-  - php: 7.1
-    env: MW=REL1_24
-  allow_failures:
-  - env: MW=REL1_24
 
 addons:
   mariadb: '10.0'
diff --git a/build/travis/install-mediawiki.sh b/build/travis/install-mediawiki.sh
index 59d29ba..3ed8de8 100644
--- a/build/travis/install-mediawiki.sh
+++ b/build/travis/install-mediawiki.sh
@@ -4,12 +4,6 @@ set -x
 
 originalDirectory=$(pwd)
 
-if [[ $TRAVIS_PHP_VERSION == *"hhvm"* ]]
-then
-	PHPINI=/etc/hhvm/php.ini
-	echo "hhvm.enable_zend_compat = true" >> $PHPINI
-fi
-
 mkdir ./../web
 cd ./../web
 
diff --git a/build/travis/run-webserver.sh b/build/travis/run-webserver.sh
index 2412031..9fda53e 100644
--- a/build/travis/run-webserver.sh
+++ b/build/travis/run-webserver.sh
@@ -2,24 +2,6 @@
 
 set -x
 
-# HHVM doesn't have a built in web server
-# We can't guarantee any single PHP version is always installed on Travis hosts
-# So list the versions and try to pick the latest PHP version
-# Also the web server on 7.1 seems to have issues, so don't use that?
-if [[ $TRAVIS_PHP_VERSION == *"hhvm"* ]] || [[ $TRAVIS_PHP_VERSION == *"7.1"* ]]
-then
-	WEBSERVERPHPVERSION=`phpenv versions | grep -v system | grep -v hhvm | grep -v 7.1 | tail -n 1 | xargs`
-	phpenv global $WEBSERVERPHPVERSION
-	php --version
-fi
-
 # Run a web server for MediaWiki and wait until it is up
 nohup php -S 0.0.0.0:8080 -t ./../web > /dev/null 2>&1 &
 until curl -s localhost:8080; do true; done > /dev/null 2>&1
-
-# Switch back to the actual php version requested for this build if needed
-if [ -v $WEBSERVERPHPVERSION ]
-then
-	phpenv global $TRAVIS_PHP_VERSION
-	php --version
-fi