diff --git a/.travis.yml b/.travis.yml
index 93ec75cd0a4e8..9d9d7fef5690d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,12 @@ matrix:
           sudo: required
           dist: trusty
           group: edge
+          env: PHP7MODE="no"
+        - php: hhvm-3.15
+          sudo: required
+          dist: trusty
+          group: edge
+          env: PHP7MODE="yes"
         - php: 5.3
         - php: 5.4
         - php: 5.5
@@ -31,6 +37,9 @@ matrix:
         - php: 7.1
           env: deps=low
     fast_finish: true
+    allow_failures:
+        - php: hhvm-3.15
+          env: PHP7MODE="yes"
 
 cache:
     directories:
@@ -60,6 +69,10 @@ before_install:
     - if [[ ! $skip && ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
     - if [[ ! $skip ]]; then [ -d ~/.composer ] || mkdir ~/.composer; cp .composer/* ~/.composer/; fi
     - if [[ ! $skip ]]; then export PHPUNIT=$(readlink -f ./phpunit); fi
+    # Option to allow HHVM's php 7 mode for one test
+    - if [[ ! $skip && $PHP7MODE == "yes" ]]; then echo hhvm.php7.all=1 >> /etc/hhvm/php.ini; fi
+    # Disable JIT compilation in hhvm, as the JIT is useless for short live scripts like tests.
+    - if [[ ! $skip && $TRAVIS_PHP_VERSION = hhvm* ]]; then echo 'hhvm.jit = 0' >> /etc/hhvm/php.ini; fi
 
 install:
     - if [[ ! $skip && $deps ]]; then cp composer.json composer.json.orig; fi
@@ -77,6 +90,7 @@ install:
     - export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
     - if [[ ! $skip && $deps ]]; then export SYMFONY_DEPRECATIONS_HELPER=weak; fi
     - if [[ ! $skip && $deps ]]; then mv composer.json.phpunit composer.json; fi
+    - if [[ ! $skip ]]; then composer self-update; fi
     - if [[ ! $skip ]]; then composer update; fi
     - if [[ ! $skip ]]; then ./phpunit install; fi
     - if [[ ! $skip && ! $PHP = hhvm* ]]; then php -i; else hhvm --php -r 'print_r($_SERVER);print_r(ini_get_all());'; fi