diff --git a/.coveragerc b/.coveragerc
index 97934dc3b..5942e71c6 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,5 +1,11 @@
 [run]
-source = pytest,_pytest,testing/
+include =
+  src/*
+  testing/*
+  .tox/*/lib/python*/site-packages/_pytest/*
+  .tox/*/lib/python*/site-packages/pytest.py
+  .tox\*\Lib\site-packages\_pytest\*
+  .tox\*\Lib\site-packages\pytest.py
 parallel = 1
 branch = 1
 
diff --git a/.travis.yml b/.travis.yml
index 9616a0818..be30f0151 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -103,9 +103,9 @@ after_success:
       # Add last TOXENV to $PATH.
       PATH="$PWD/.tox/${TOXENV##*,}/bin:$PATH"
       coverage combine
-      coverage xml --ignore-errors
-      coverage report -m --ignore-errors
-      bash <(curl -s https://codecov.io/bash) -Z -X gcov -X coveragepy -X search -X xcode -X gcovout -X fix -f coverage.xml -F $TRAVIS_OS_NAME
+      coverage xml
+      coverage report -m
+      bash <(curl -s https://codecov.io/bash) -Z -X gcov -X coveragepy -X search -X xcode -X gcovout -X fix -f coverage.xml -F $TRAVIS_OS_NAME -n $TOXENV
     fi
 
 notifications:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 949c39fc4..e27f03ee8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -120,3 +120,4 @@ jobs:
     condition: eq(variables['PYTEST_COVERAGE'], '1')
     env:
       CODECOV_TOKEN: $(CODECOV_TOKEN)
+      PYTEST_CODECOV_NAME: $(tox.env)
diff --git a/scripts/upload-coverage.bat b/scripts/upload-coverage.bat
index 2e84f99dd..ad8092d16 100644
--- a/scripts/upload-coverage.bat
+++ b/scripts/upload-coverage.bat
@@ -8,9 +8,9 @@ if "%PYTEST_COVERAGE%" == "1" (
     )
     python -m pip install codecov
     coverage combine
-    coverage xml --ignore-errors
-    coverage report -m --ignore-errors
-    scripts\retry codecov --required -X gcov pycov search -f coverage.xml --flags windows
+    coverage xml
+    coverage report -m
+    scripts\retry codecov --required -X gcov pycov search -f coverage.xml --flags windows --name %PYTEST_CODECOV_NAME%
 ) else (
     echo Skipping coverage upload, PYTEST_COVERAGE=%PYTEST_COVERAGE%
 )