diff --git a/codecov.yml b/.codecov.yml
similarity index 61%
rename from codecov.yml
rename to .codecov.yml
index dfbad81d..2ed71e65 100644
--- a/codecov.yml
+++ b/.codecov.yml
@@ -2,10 +2,9 @@ codecov:
   require_ci_to_pass: false
 
 comment:
-  layout: "reach,diff,flags,files"
-  require_changes: false
-  behavior: update
-  after_n_builds: 1
+  layout: "diff, flags, files"
+  behavior: default
+  require_changes: false  # if true: only post the comment if coverage changes
 
 coverage:
   status:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e4077aac..39b6848f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -108,4 +108,8 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: coverage.xml
+          verbose: false  # Used for debugging only
           fail_ci_if_error: false  # Avoid failing job if Codecov is down
+        env:
+          CODECOV_PR:  ${{ github.event.pull_request.number }}
+          CODECOV_SHA: ${{ github.sha }}
diff --git a/pyproject.toml b/pyproject.toml
index fa40fe80..975c60ca 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -348,7 +348,7 @@ builtins-ignorelist = ["_"]
 
 [tool.pytest.ini_options]
 # Keep pytest-cov minimal, let Coverage.py control formatting.
-addopts = "-ra --cov=apprise --cov-branch --cov-report=xml"
+addopts = "-ra"
 testpaths = ["tests"]
 python_files = ["test_*.py", "tests/test_*.py"]
 filterwarnings = ["once::Warning"]
diff --git a/tox.ini b/tox.ini
index 72ddbb13..1b520e39 100644
--- a/tox.ini
+++ b/tox.ini
@@ -116,16 +116,20 @@ description = Full tests with all plugins + code coverage
 extras = dev,all-plugins
 commands =
     pip install --no-cache-dir -e ".[dev,all-plugins]"
+    coverage erase
     coverage run --source=apprise -m pytest tests {posargs}
-    coverage report
+    coverage report -m
+    coverage xml -o coverage.xml
 
 [testenv:minimal]
 description = Minimal dependencies + code coverage
 extras = dev
 commands =
     pip install --no-cache-dir -e ".[dev]"
+    coverage erase
     coverage run --source=apprise -m pytest tests {posargs}
-    coverage report
+    coverage report -m
+    coverage xml -o coverage.xml
 
 [testenv:test]
 description = Run simplified tests without coverage