diff --git a/.travis.yml b/.travis.yml
index 4a507f47c1..8fc2707978 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ before_install:
   - yes | pecl install imagick-beta
 install:
   - if [[ $TRAVIS_PHP_VERSION = 5.* ]];then travis_retry composer install --no-progress --no-interaction --optimize-autoloader; fi;
-  - if [[ $TRAVIS_PHP_VERSION = 7.* ]];then travis_retry composer install --no-interaction --no-progress --ignore-platform-reqs; travis_retry composer remove --no-interaction --dev phpunit/phpunit; travis_retry composer require --dev phpunit/phpunit --sort-packages --optimize-autoloader --no-progress --no-interaction; fi;
+  - if [[ $TRAVIS_PHP_VERSION = 7.* ]];then travis_retry composer update --no-progress --no-interaction --optimize-autoloader; fi;
   - travis_retry npm install
 before_script:
   - mysql -e 'CREATE DATABASE update39_test;CREATE DATABASE ab_test;CREATE DATABASE db_test;SET @@global.sql_mode=STRICT_ALL_TABLES;SET @@global.max_allowed_packet=33554432;SET @@global.wait_timeout=999999;'
diff --git a/composer.json b/composer.json
index 56c00e8229..9aee8b75f4 100644
--- a/composer.json
+++ b/composer.json
@@ -103,7 +103,7 @@
     },
     "require-dev":  {
         "mikey179/vfsStream": "~1.5",
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": "^4.8|^5.0"
     },
     "autoload":     {
         "psr-0": {