diff --git a/.travis.yml b/.travis.yml
index 4e5933ce4..d61108eb6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,24 +2,33 @@ sudo: false
 
 language: php
 
-php:
-  - 7.1
-  - 7.2
-
 cache:
   directories:
-    - $HOME/.composer/cache/files
+    - $HOME/.composer/cache
 
 env:
   global:
-    - SYMFONY_DEPRECATIONS_HELPER=weak
-    - SYMFONY_VERSION=3.4.*
+    - SYMFONY_DEPRECATIONS_HELPER="weak_vendors"
 
 matrix:
-  include:
-    - env: SYMFONY_VERSION=4.0.*
   fast_finish: true
-
+  include:
+    - php: 7.1
+      env: SYMFONY_VERSION=4.0.*
+    - php: 7.1
+      env: SYMFONY_VERSION=3.4.*
+    - php: 7.2
+      env: SYMFONY_VERSION=4.0.*
+    - php: 7.2
+      env: SYMFONY_VERSION=3.4.*
+    - php: 7.2
+      env: SYMFONY_VERSION=dev-master
+    - php: nightly
+      env: SYMFONY_VERSION=4.0.*
+  allow_failures: 
+    - env: SYMFONY_VERSION=dev-master
+    - php: nightly
+    
 before_install:
   - bash ./.travis/exec-before.bash
 
@@ -27,7 +36,7 @@ install:
   - travis_retry composer require "symfony/symfony:${SYMFONY_VERSION}" $COMPOSER_FLAGS
 
 script:
-  - ./vendor/bin/simple-phpunit -vvv || ./vendor/bin/phpunit -vvv
+  - ./vendor/bin/simple-phpunit -vvv
 
 after_script:
-  - bash ./.travis/exec-after.bash
\ No newline at end of file
+  - bash ./.travis/exec-after.bash
diff --git a/composer.json b/composer.json
index c41fe2587..c3a0d9d65 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,6 @@
         "enqueue/enqueue-bundle": "^0.7|^0.8",
         "friendsofphp/php-cs-fixer": "^1.0|^2.0",
         "league/flysystem": "^1.0",
-        "phpunit/phpunit": "^6.0",
         "psr/log": "^1.0",
         "satooshi/php-coveralls": "^1.0",
         "symfony/browser-kit": "^3.0|^4.0",