diff --git a/.travis.yml b/.travis.yml
index 971202dd6..83a91473d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,7 @@ after_success:
     - weechat --license
     - weechat --version
     - weechat --temp-dir --run-command "/debug dirs;/debug libs" --run-command "/quit"
+    - if [ "$CODECOVERAGE" = "1" ]; then bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov error"; fi
 
 matrix:
     fast_finish: true
diff --git a/tools/build-test.sh b/tools/build-test.sh
index a769148c7..47ab99210 100755
--- a/tools/build-test.sh
+++ b/tools/build-test.sh
@@ -77,7 +77,6 @@ if [ "$BUILDTOOL" = "cmake" ]; then
         run "lcov --directory . --capture --output-file coverage.info"
         run "lcov --remove coverage.info '/usr/*' --output-file coverage.info"
         run "lcov --list coverage.info"
-        bash <(curl -s https://codecov.io/bash) -f coverage.info
     fi
 fi