diff --git a/.travis.yml b/.travis.yml
index 6d7d7d6c92..0139021317 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@ matrix:
   include:
   - php: 7.1
     env: WP_TRAVISCI=travis:js
-  - php: 7.1
   - php: 7.2
+  - php: 7.1
   - php: 7.0
   - php: 5.6
   - php: 5.6
@@ -48,10 +48,11 @@ before_install:
   fi
 before_script:
 - |
-  # Remove Xdebug for a huge performance increase, but not from nightly:
-  stable='^[0-9\.]+$'
-  if [[ "$TRAVIS_PHP_VERSION" =~ $stable ]]; then
+  # Remove Xdebug for a huge performance increase:
+  if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
     phpenv config-rm xdebug.ini
+  else
+    echo "xdebug.ini does not exist"
   fi
 - |
   # Export Composer's global bin dir to PATH, but not on PHP 5.2:
@@ -63,7 +64,7 @@ before_script:
   # Install the specified version of PHPUnit depending on the PHP version:
   if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
     case "$TRAVIS_PHP_VERSION" in
-      7.1|7.0|nightly)
+      7.2|7.1|7.0|nightly)
         echo "Using PHPUnit 6.1"
         composer global require "phpunit/phpunit=6.1.*"
         ;;