diff --git a/.travis.yml b/.travis.yml
index 98ad9656a..d0981f56b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,7 @@
 language: php
 
 php:
-    - 5.4
-    - 5.5
-    - 5.6
-    - 7.0
+    - nightly
     - hhvm
 
 branches:
@@ -19,10 +16,16 @@ matrix:
           env: SYMFONY_VERSION=2.7.*
         - php: 5.5
           env: SYMFONY_VERSION=2.8.*
-        - php: 7.0
-          env: SYMFONY_VERSION=2.8.*
+        - php: 5.6
+          env: SYMFONY_VERSION=3.0.*
         - php: 7.0
           env: SYMFONY_VERSION=3.0.*
+        - php: 7.0
+          env: SYMFONY_VERSION='3.1.*@dev'
+
+allow_failures:
+    - php: nightly
+    - env: SYMFONY_VERSION='3.1.*@dev'
 
 cache:
     directories:
@@ -35,7 +38,7 @@ before_install:
 
 install: composer update --prefer-dist --no-interaction
 
-script: if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then php -d xdebug.max_nesting_level=1000 vendor/bin/phpunit --debug --coverage-clover=coverage.clover; else vendor/bin/phpunit --debug; fi
+script: if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then phpunit -d xdebug.max_nesting_level=1000 --debug --coverage-clover=coverage.clover; else phpunit --debug; fi
 
 after_script:
     - if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
diff --git a/README.md b/README.md
index 96d77da7c..9419ed852 100644
--- a/README.md
+++ b/README.md
@@ -855,10 +855,12 @@ Contribute
 
 Tests:
 
+Install [phpunit](https://phpunit.de/manual/current/en/installation.html).
+
 In the bundle directory:
 
 ```bash
-vendor/phpunit/phpunit/phpunit
+phpunit
 ```
 
 Fix PHP CS:
diff --git a/composer.json b/composer.json
index fbed3d4a8..f4e28f111 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,6 @@
     },
     "require-dev": {
         "fabpot/php-cs-fixer": "^1.11",
-        "phpunit/phpunit": "^4.1|^5.1",
         "sensio/framework-extra-bundle": "^3.0.13",
         "sllh/php-cs-fixer-styleci-bridge": "^1.5",
         "symfony/browser-kit": "^2.7|^3.0",