diff --git a/.travis.yml b/.travis.yml
index fe69f58..f64e3c1 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,9 @@ env:
 
 matrix:
   include:
+    - php: 7.1
+      env: DB=MYSQL CORE_RELEASE=4 COVERAGE=1
+
     - php: 5.5
       env: DB=MYSQL CORE_RELEASE=4
 
@@ -33,10 +36,6 @@ matrix:
     - php: 7.0
       env: DB=MYSQL CORE_RELEASE=4
 
-    - php: 7.1
-      env: DB=MYSQL CORE_RELEASE=4 COVERAGE=1
-
-
 before_script:
   - phpenv rehash
   - composer self-update || true
@@ -53,8 +52,8 @@ script:
   # Execute tests with coverage.  Do this for a small
   - "if [ \"$COVERAGE\" = \"1\" ]; then vendor/bin/phpunit --coverage-clover=coverage.clover $MODULE_PATH/tests/; fi"
 
-#Upload coverage even if there is a failure
-after_script:
+# Upload code coverage when tests pass
+after_success:
   - "if [ \"$COVERAGE\" = \"1\" ]; then mv coverage.clover ~/build/$TRAVIS_REPO_SLUG/; fi"
   - cd ~/build/$TRAVIS_REPO_SLUG
   - "if [ \"$COVERAGE\" = \"1\" ]; then travis_retry codecov; fi"