diff --git a/.travis.yml b/.travis.yml
index ec7592a6efc..957cbb219d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,26 +21,26 @@ env:
     # Set default python version to avoid repetition later
     - PYTHON_VERSION=3.5
     - BUILD_DOCS=false
-    - COVERALLS=false
+    - CODECOV=false
     - PYTEST_FLAGS="--disable-pytest-warnings --numprocesses 2 --durations=50"
     - PYTEST_LIST="testsuite/MDAnalysisTests"
     - MAIN_CMD="pytest ${PYTEST_LIST}"
     - SETUP_CMD="${PYTEST_FLAGS}"
     - BUILD_CMD="pip install -v package/ && pip install testsuite/"
-    - CONDA_MIN_DEPENDENCIES="mmtf-python mock six biopython networkx cython joblib matplotlib scipy griddataformats hypothesis gsd"
-    - CONDA_DEPENDENCIES="${CONDA_MIN_DEPENDENCIES} seaborn>=0.7.0 clustalw=2.1 netcdf4 scikit-learn coveralls"
+    - CONDA_MIN_DEPENDENCIES="mmtf-python mock six biopython networkx cython joblib matplotlib scipy griddataformats hypothesis gsd codecov"
+    - CONDA_DEPENDENCIES="${CONDA_MIN_DEPENDENCIES} seaborn>=0.7.0 clustalw=2.1 netcdf4 scikit-learn"
     - CONDA_CHANNELS='biobuilds conda-forge'
     - CONDA_CHANNEL_PRIORITY=True
-    - PIP_DEPENDENCIES="duecredit sphinx-sitemap"
+    - PIP_DEPENDENCIES="duecredit"
     - NUMPY_VERSION=stable
     - INSTALL_HOLE="true"
 
   matrix:
-    # Run a coverage test
-    - COVERALLS="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
-    - PYTHON_VERSION=3.6
-    - PYTHON_VERSION=3.4
-    - PYTHON_VERSION=2.7
+    # Run a coverage test for most versions
+    - CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
+    - PYTHON_VERSION=3.6 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
+    - PYTHON_VERSION=3.4 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
+    - PYTHON_VERSION=2.7 CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
     - NUMPY_VERSION=1.10.4
     - NUMPY_VERSION=dev  EVENT_TYPE="cron"
 
@@ -53,6 +53,7 @@ matrix:
            BUILD_DOCS=true
            BUILD_CMD="cd ${TRAVIS_BUILD_DIR}/package && python setup.py build_ext --inplace"
            INSTALL_HOLE="false"
+           PIP_DEPENDENCIES="${PIP_DEPENDENCIES} sphinx-sitemap"
 
     - env: NAME="Lint"
            PYLINTRC="${TRAVIS_BUILD_DIR}/package/.pylintrc"
@@ -71,6 +72,8 @@ matrix:
     - env: NAME='minimal'
            CONDA_DEPENDENCIES=${CONDA_MIN_DEPENDENCIES}
            INSTALL_HOLE="false"
+           CODECOV="true" SETUP_CMD="${PYTEST_FLAGS} --cov=MDAnalysis"
+
   allow_failures:
     - env: NUMPY_VERSION=dev EVENT_TYPE="cron"
 
@@ -104,8 +107,8 @@ script:
 
 after_success:
   - |
-    if [[ $COVERALLS == 'true' ]]; then \
-      coveralls; \
+    if [[ $CODECOV == 'true' ]]; then \
+      codecov; \
     fi
   # can't use test here since this leads to travis fails even though the build passes
   - if [[ ${TRAVIS_PULL_REQUEST} == "false" ]] && [[ ${BUILD_DOCS} == "true" ]] && [[ ${TRAVIS_BRANCH} == ${GH_DOC_BRANCH} ]]; then
diff --git a/README.rst b/README.rst
index 069ec44afc1..9aff2028aea 100644
--- a/README.rst
+++ b/README.rst
@@ -102,17 +102,17 @@ to find uncovered code.
    :target: https://www.mdanalysis.org/mdanalysis/
 
 .. |build| image:: https://travis-ci.org/MDAnalysis/mdanalysis.svg?branch=develop
-    :alt: Build Status
-    :target: https://travis-ci.org/MDAnalysis/mdanalysis
+   :alt: Build Status
+   :target: https://travis-ci.org/MDAnalysis/mdanalysis
 
-.. |cov|   image:: https://coveralls.io/repos/MDAnalysis/mdanalysis/badge.svg?branch=develop
-    :alt: Coverage Status
-    :target: https://coveralls.io/r/MDAnalysis/mdanalysis?branch=develop
+.. |cov|   image:: https://codecov.io/gh/MDAnalysis/mdanalysis/branch/develop/graph/badge.svg
+   :alt: Coverage Status
+   :target: https://codecov.io/gh/MDAnalysis/mdanalysis
 
 .. |anaconda| image:: https://anaconda.org/conda-forge/mdanalysis/badges/version.svg
-    :alt: Anaconda
-    :target: https://anaconda.org/conda-forge/mdanalysis
+   :alt: Anaconda
+   :target: https://anaconda.org/conda-forge/mdanalysis
 
 .. |mybinder| image:: https://mybinder.org/badge.svg
-    :alt: My Binder
-    :target: https://mybinder.org/v2/gh/MDAnalysis/binder-notebook/master
+   :alt: My Binder
+   :target: https://mybinder.org/v2/gh/MDAnalysis/binder-notebook/master
diff --git a/package/SUMMARY.txt b/package/SUMMARY.txt
index 9e7d893ed78..9e9a7c81b80 100644
--- a/package/SUMMARY.txt
+++ b/package/SUMMARY.txt
@@ -121,18 +121,18 @@ For citations of included algorithms and sub-modules please see the references_.
    :target: https://docs.mdanalysis.org
 
 .. |build| image:: https://travis-ci.org/MDAnalysis/mdanalysis.svg?branch=develop
-    :alt: Build Status
-    :target: https://travis-ci.org/MDAnalysis/mdanalysis
+   :alt: Build Status
+   :target: https://travis-ci.org/MDAnalysis/mdanalysis
 
-.. |cov|   image:: https://coveralls.io/repos/MDAnalysis/mdanalysis/badge.svg?branch=develop
-    :alt: Coverage Status
-    :target: https://coveralls.io/r/MDAnalysis/mdanalysis?branch=develop
+.. |cov|   image:: https://codecov.io/gh/MDAnalysis/mdanalysis/branch/develop/graph/badge.svg
+   :alt: Coverage Status
+   :target: https://codecov.io/gh/MDAnalysis/mdanalysis
 
 .. |anaconda| image:: https://anaconda.org/conda-forge/mdanalysis/badges/version.svg
-    :alt: Anaconda
-    :target: https://anaconda.org/conda-forge/mdanalysis
+   :alt: Anaconda
+   :target: https://anaconda.org/conda-forge/mdanalysis
 
 .. |mybinder| image:: https://mybinder.org/badge.svg
-    :alt: My Binder
-    :target: https://mybinder.org/v2/gh/MDAnalysis/binder-notebook/master
+   :alt: My Binder
+   :target: https://mybinder.org/v2/gh/MDAnalysis/binder-notebook/master
    
diff --git a/testsuite/README b/testsuite/README
index ebc78b15536..d1c116b7163 100644
--- a/testsuite/README
+++ b/testsuite/README
@@ -41,12 +41,12 @@ Help is also available through the mailing list at https://groups.google.com/gro
 .. badges
    
 .. |build| image:: https://travis-ci.org/MDAnalysis/mdanalysis.svg?branch=develop
-    :alt: Build Status
-    :target: https://travis-ci.org/MDAnalysis/mdanalysis
+   :alt: Build Status
+   :target: https://travis-ci.org/MDAnalysis/mdanalysis
 
-.. |cov|   image:: https://coveralls.io/repos/MDAnalysis/mdanalysis/badge.svg?branch=develop
-    :alt: Coverage Status
-    :target: https://coveralls.io/r/MDAnalysis/mdanalysis?branch=develop
+.. |cov|   image:: https://codecov.io/gh/MDAnalysis/mdanalysis/branch/develop/graph/badge.svg
+   :alt: Coverage Status
+   :target: https://codecov.io/gh/MDAnalysis/mdanalysis	     
 
 .. |devdocs| image:: https://img.shields.io/badge/docs-development-yellow.svg
    :alt: Documentation (development version)
diff --git a/testsuite/setup.py b/testsuite/setup.py
index 8b73a641456..15912d67843 100755
--- a/testsuite/setup.py
+++ b/testsuite/setup.py
@@ -170,7 +170,7 @@ def dynamic_author_list():
           download_url='https://github.com/MDAnalysis/mdanalysis/releases',
           project_urls={'Documentation': 'https://github.com/MDAnalysis/mdanalysis/wiki/UnitTests',
                         'CI Tests': 'https://travis-ci.org/MDAnalysis/mdanalysis',
-                        'CI Coverage': 'https://coveralls.io/r/MDAnalysis/mdanalysis?branch=develop',
+                        'CI Coverage': 'https://codecov.io/gh/MDAnalysis/mdanalysis',
                         'Developer Group': 'https://groups.google.com/forum/#!forum/mdnalysis-devel',
                         'Issue Tracker': 'https://github.com/mdanalysis/mdanalysis/issues',
                         'Source': 'https://github.com/mdanalysis/mdanalysis',