diff --git a/.travis.yml b/.travis.yml
index 0e69dda..db767fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,42 +6,28 @@ cache:
   directories:
     - $HOME/.composer/cache
 
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - nightly
-  - hhvm
-
-env:
-    global:
-        - SYMFONY_DEPRECATIONS_HELPER=weak
-
 matrix:
     include:
+        - php: 5.4
+          env: SYMFONY_VERSION=2.3.*
+        - php: 5.5
         - php: 5.6
-          env: COMPOSER_FLAGS="--prefer-lowest"
+          env: SYMFONY_VERSION=2.7.* COVERAGE=true
         - php: 5.6
-          env: SYMFONY_VERSION=2.4.*
+          env: SYMFONY_VERSION=2.8.*
         - php: 5.6
-          env: SYMFONY_VERSION=2.6.*
-        - php: 5.6
-          env: SYMFONY_VERSION=2.7.*
-        - php: 5.6
-          env: SYMFONY_VERSION=2.8.*@dev SYMFONY_DEPRECATIONS_HELPER=strict
-        - php: 5.6
-          env: SYMFONY_VERSION=3.0.* DEPENDENCIES=dev COMPOSER_FLAGS="--prefer-stable" SYMFONY_DEPRECATIONS_HELPER=strict
-    allow_failures:
-        - php: nightly
-        - env: SYMFONY_VERSION=2.8.*@dev
-        - env: SYMFONY_VERSION=3.0.*
+          env: SYMFONY_VERSION=3.0.* DEPENDENCIES=dev COMPOSER_FLAGS="--prefer-stable"
+        - php: 7.0
+        - php: hhvm
     fast_finish: true
 
 before_script:
+    - if [ "$COVERAGE" != "true" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
     - composer self-update
     - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
-    - if [ "$SYMFONY_VERSION" != "3.0.x-dev as 2.8" ] && [ "$SYMFONY_VERSION" != "2.7.*" ]; then sed -i "/dunglas\/api-bundle/d;/symfony\/serializer/d" composer.json; fi;
+    - if [ "$SYMFONY_VERSION" != "3.0.*" ] && [ "$SYMFONY_VERSION" != "2.8.*" ] && [ "$SYMFONY_VERSION" != "2.7.*" ]; then sed -i "/dunglas\/api-bundle/d;/symfony\/serializer/d" composer.json; fi;
     - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
     - composer update $COMPOSER_FLAGS
 
-script: phpunit --coverage-text
+script:
+    - if [ "$COVERAGE" == "true" ]; then phpunit --coverage-text; else phpunit; fi