diff --git a/.travis.yml b/.travis.yml
index b9b784f..d7ac453 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,18 @@ cache:
   directories:
     - $HOME/.composer/cache
 
+# This is executed for all stages
+before_install:
+  - composer self-update
+  - composer --version
+  - if php -i | grep -q xdebug; then phpenv config-rm xdebug.ini; fi
+
 install:
   - composer require typo3/cms="$TYPO3_VERSION"
   - composer install
 
 jobs:
+  fast_finish: true
   include:
     - php: 7.1
       env: TYPO3_VERSION=^8.7
@@ -18,6 +25,8 @@ jobs:
       env: TYPO3_VERSION=^8.7
 
     - stage: test
+      php: 7.1
+      env: TYPO3_VERSION=^8.7
       script:
         - composer lint
         - composer cgl