diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index c8e4a30f98..e9de29e33e 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -59,3 +59,12 @@ test_script:
   # https://github.com/appveyor/ci/issues/688
   - "%CMD_IN_ENV% python -m pytest --cov -k \"not ClangASTPrintBear and not ClangCloneDetectionBear and not ClangComplexityBear and not ClangCountVectorCreator and not ClangCountingConditions\""
   - "%CMD_IN_ENV% python setup.py install"
+
+on_success:
+  - codecov
+
+on_failure:
+  - codecov
+
+matrix:
+  fast_finish: true
diff --git a/.ci/deploy.coverage.sh b/.ci/deploy.coverage.sh
deleted file mode 100644
index 64e025bd6f..0000000000
--- a/.ci/deploy.coverage.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -x
-set -e
-
-source .ci/env_variables.sh
-
-bash <(curl -s https://codecov.io/bash)
diff --git a/.travis.yml b/.travis.yml
index c239659cb9..f8d1ccceda 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -127,7 +127,7 @@ script:
       mv .coafile.new .coafile
     fi
   - coala --non-interactive
-  - bash .ci/deploy.coverage.sh
+  - codecov
   - rm -rf docs/API && make -C docs clean
   - python setup.py docs
 
diff --git a/circle.yml b/circle.yml
index 11b43d3519..97605c5828 100644
--- a/circle.yml
+++ b/circle.yml
@@ -59,7 +59,7 @@ test:
         parallel: true
     - coala-ci -L DEBUG:
         parallel: true
-    - bash .ci/deploy.coverage.sh:
+    - codecov:
         parallel: true
     - rm -rf docs/API && make -C docs clean
     - python setup.py docs:
diff --git a/test-requirements.txt b/test-requirements.txt
index 09c2d27ac6..def109dad0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,5 @@
 coverage~=4.2.0
+codecov~=2.0.5
 pytest~=3.0
 pytest-cov~=2.4
 pytest-env~=0.6.0