diff --git a/.travis.yml b/.travis.yml
index 91a78e10..6cb0925b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,19 +9,19 @@ cache:
 matrix:
     include:
         - php: 5.5
-          env: COMPOSER_VERSION=""
+          env: COMPOSER_VERSION="1.6.*"
         - php: 5.6
-          env: COMPOSER_VERSION=""
+          env: COMPOSER_VERSION="1.6.*"
         - php: 7.0
-          env: COMPOSER_VERSION=""
+          env: COMPOSER_VERSION="1.6.*"
         - php: 7.1
-          env: COMPOSER_VERSION=""
+          env: COMPOSER_VERSION="1.6.*"
         - php: 7.2
-          env: COMPOSER_VERSION=""
+          env: COMPOSER_VERSION="1.6.*"
         - php: 7.3
-          env: COMPOSER_VERSION=""
+          env: COMPOSER_VERSION="1.6.*"
         - php: nightly
-          env: COMPOSER_VERSION=""
+          env: COMPOSER_VERSION="1.6.*"
 
     allow_failures:
         - php: nightly
@@ -30,18 +30,18 @@ matrix:
 
 before_script:
     - composer self-update
-    - composer global require --prefer-source phpunit/phpunit:"^4.8 || ^5.7.0" satooshi/php-coveralls:^1.0.0
+    - composer global require --prefer-source phpunit/phpunit:"^4.8 || ^5.7.0 || ^6.5.0" php-coveralls/php-coveralls:^2.1.0
     - if [ "$COMPOSER_VERSION" == "" ]; then composer install --prefer-source; fi;
     - if [ "$COMPOSER_VERSION" != "" ]; then composer require "composer/composer:${COMPOSER_VERSION}" --no-update; fi;
-    - if [ "$COMPOSER_VERSION" != "" ]; then composer update "composer/composer" --prefer-source; fi;
+    - if [ "$COMPOSER_VERSION" != "" ]; then composer update --prefer-source; fi;
     - mkdir -p ./build/logs
 
 script:
     - ~/.composer/vendor/bin/phpunit -v --coverage-clover ./build/logs/clover.xml
 
-after_script:
+after_success:
     - 'echo ''coverage_clover: build/logs/clover.xml'' >> ./.coveralls.yml'
-    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then php ~/.composer/vendor/bin/coveralls -v; fi;'
+    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then php ~/.composer/vendor/bin/php-coveralls -v; fi;'
 
 notifications:
     email: false