diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 000000000..69cb76019
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1 @@
+comment: false
diff --git a/.travis.yml b/.travis.yml
index 1dda25b66..af49ccd52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,9 @@ matrix:
       before_install: *macos_before_install
 
 install:
-    - python3 -m pip install -U pip
+    - python3 -m pip install -U pip codecov
 
 script:
     - ./pr-check.sh
+after_success:
+    - codecov
diff --git a/pr-check.sh b/pr-check.sh
index 045d73e4e..85006e44c 100755
--- a/pr-check.sh
+++ b/pr-check.sh
@@ -69,7 +69,6 @@ function exit_with_error {
 function exit_with_error_and_venv {
     $deactivate_venv
     cd $basedir
-    rm -f .coverage.*
     $remove_venv $venv
     exit_with_error "$1"
 }
diff --git a/run-tests.sh b/run-tests.sh
index fc1b18da5..3271dde2a 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -38,6 +38,9 @@ then
 fi
 $mpi_command -n 2 coverage run -m pytest
 
+# Coverage produces empty files which trigger warnings on combine
+find . -name ".coverage.*" -size 0 -print0 | xargs -0 rm -f
+
 coverage combine
 
 # Travis error workaround
@@ -58,6 +61,5 @@ rm $coverage_report
 
 if [ $report_exit_code = 2 ]
 then
-    echo "ERROR: Coverage too low."
+    echo "WARNING: Coverage too low."
 fi
-exit $report_exit_code
diff --git a/setup.cfg b/setup.cfg
index 80bfe24c9..f7429fbc3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,7 @@ ignore =
 [coverage:run]
 source = brainiak
 branch = True
+concurrency = multiprocessing
 parallel = True
 
 [coverage:report]