diff --git a/.coveragerc b/.coveragerc
index b8eef0c1..612b51b8 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,7 @@
 [run]
 concurrency = gevent
+source = codecov
+branch = True
 omit =
     */test/*
     */tests/*
@@ -12,3 +14,5 @@ omit =
 exclude_lines =
     pragma: no cover
     if __name__ == .__main__.:
+    def __repr__
+    raise NotImplementedError
diff --git a/.travis.yml b/.travis.yml
index 0e3cd257..dbc29343 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ install:
   - python setup.py -q install
   - pip install -r extra_requirements.txt
   - pip install coverage pytest-cov coveralls
+  - pip install codecov
   - npm install
 
 before_script:
@@ -32,7 +33,8 @@ before_script:
 
 script:
   - python setup.py test
-  - cd karma-tests && make test
+  - cd karma-tests && make test && cd ..
 
 after_success:
-    coveralls
+  - codecov
+
diff --git a/README.rst b/README.rst
index 97f12195..eddb9f17 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,12 @@
 Webrecorder pywb 2.0.0
 ======================
 
-.. image:: https://travis-ci.org/ikreymer/pywb.svg?branch=master
-      :target: https://travis-ci.org/ikreymer/pywb
-.. image:: https://coveralls.io/repos/ikreymer/pywb/badge.svg?branch=master
-      :target: https://coveralls.io/r/ikreymer/pywb?branch=master
+.. image:: https://travis-ci.org/webrecorder/pywb.svg?branch=develop
+      :target: https://travis-ci.org/webrecorder/pywb
+.. image:: https://ci.appveyor.com/api/projects/status/qxnbunw65o929599/branch/develop?svg=true
+      :target: https://ci.appveyor.com/project/webrecorder/pywb/branch/develop
+.. image:: https://codecov.io/gh/webrecorder/pywb/branch/develop/graph/badge.svg
+      :target: https://codecov.io/gh/webrecorder/pywb
 
 Web Archiving Tools for All
 ---------------------------
diff --git a/appveyor.yml b/appveyor.yml
index 48626f21..38fe0205 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,6 +18,7 @@ install:
   - "pip install cffi"
   - "pip install pyopenssl"
   - "pip install certauth boto3 youtube-dl"
+  - "pip install codecov"
 
 build_script:
   - "python setup.py install"
@@ -25,4 +26,10 @@ build_script:
 test_script:
   - "python setup.py test"
 
+after_test:
+  - rm -rf tests/coverages
+  - if not exist dist mkdir dist
+  - if exist .coverage (cp .coverage dist\) else (echo no .coverage)
+  - codecov
+  - if exist coverage.xml (cp coverage.xml dist\) else (echo no coverage.xml)