diff --git a/.travis.yml b/.travis.yml
index dcd3f123..aefe2418 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ php:
   - 5.4
   - 5.5
   - 5.6
-  - hhvm
   - 7
 
 env:
@@ -13,6 +12,8 @@ env:
 
 matrix:
   include:
+    - php: hhvm
+      dist: trusty
     - php: 5.5
       env: VARNISH_VERSION=3.0
     - php: 5.3
@@ -27,6 +28,7 @@ branches:
 before_script:
   # Install deps
   - composer update $COMPOSER_FLAGS --dev --prefer-source --no-interaction
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7' ]; then wget https://phar.phpunit.de/phpunit-5.7.phar; fi"
   # Install Varnish
   - curl http://repo.varnish-cache.org/debian/GPG-key.txt | sudo apt-key add -
   - echo "deb http://repo.varnish-cache.org/ubuntu/ precise varnish-${VARNISH_VERSION}" | sudo tee -a /etc/apt/sources.list
@@ -40,7 +42,8 @@ before_script:
   - sh -c "if [ '$TRAVIS_PHP_VERSION' = 'hhvm' ]; then ./tests/ci/install-apache-hhvm.sh; fi"
 
 script:
-  - phpunit --coverage-clover=coverage.clover
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' = '7' ]; then php phpunit-5.7.phar --coverage-clover=coverage.clover; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' \< '7' ]; then phpunit --coverage-clover=coverage.clover; fi"
   - make -C doc SPHINXOPTS='-nW' html
   - make -C doc spelling