diff --git a/.travis.yml b/.travis.yml
index 331620d563b..c9fd625d9a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,9 @@ cache:
 matrix:
   include:
     - php: '7.0'
-    - php: '7.1.0' # Prevent phpdbg's segfaults
+    - php: '7.1'
       env: coverage=1 lint=1
-    - php: '7.1.0'
+    - php: '7.1'
       env: deps='low'
 
 before_install:
@@ -22,7 +22,7 @@ before_install:
   - if [[ $coverage = 1 ]]; then mkdir -p build/logs build/cov; fi
   - if [[ $coverage = 1 ]]; then wget https://phar.phpunit.de/phpcov.phar; fi
   - if [[ $coverage = 1 ]]; then wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; fi
-  - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.1.2/php-cs-fixer.phar; fi
+  - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.3.1/php-cs-fixer.phar; fi
   - if [[ $lint = 1 ]]; then composer global require phpstan/phpstan; fi
   - export PATH="$PATH:$HOME/.composer/vendor/bin"
 
@@ -32,8 +32,8 @@ install:
   - if [[ $deps = 'low' ]]; then composer update --prefer-dist --no-progress --no-suggest --prefer-stable --prefer-lowest --ansi; fi
 
 script:
-  - if [[ $coverage = 1 ]]; then phpdbg -qrr vendor/bin/phpunit --colors=never --coverage-php build/cov/coverage-phpunit.cov; else vendor/bin/phpunit --colors=never; fi
-  - if [[ $coverage = 1 ]]; then for feature in $(ls -d features/*/ | cut -f2 -d'/' | grep -v bootstrap); do FEATURE=$feature phpdbg -qrr vendor/bin/behat --profile coverage features/$feature --no-colors; done; else vendor/bin/behat --no-colors; fi
+  - if [[ $coverage = 1 ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-php build/cov/coverage-phpunit.cov; else vendor/bin/phpunit; fi
+  - if [[ $coverage = 1 ]]; then for f in $(find features -name '*.feature'); do FEATURE=${f//\//_} phpdbg -qrr vendor/bin/behat --profile coverage $f; done; else vendor/bin/behat; fi
   - if [[ $coverage = 1 ]]; then phpdbg -qrr phpcov.phar merge --clover build/logs/clover.xml build/cov; fi
   - tests/Fixtures/app/console api:swagger:export > swagger.json && swagger validate swagger.json && rm swagger.json
   - if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff --no-ansi; fi