diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 55f7d6570ad..907a6f78bc7 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -212,7 +212,7 @@ jobs:
         PIP_USER: 1
       run: >-
         PATH="${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH}"
-        pytest
+        pytest --junitxml=junit.xml
       shell: bash
     - name: Re-run the failing tests with maximum verbosity
       if: failure()
@@ -248,6 +248,12 @@ jobs:
             steps.python-install.outputs.python-version
           }}
         token: ${{ secrets.CODECOV_TOKEN }}
+    - name: Upload test results to Codecov
+      if: ${{ !cancelled() }}
+      uses: codecov/test-results-action@v1
+      with:
+        fail_ci_if_error: true
+        token: ${{ secrets.CODECOV_TOKEN }}
 
   check:  # This job does nothing and is only used for the branch protection
     if: always()
diff --git a/setup.cfg b/setup.cfg
index 15b66caffea..20603bf2320 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -165,7 +165,6 @@ junit_suite_name = aiohttp_test_suite
 norecursedirs = dist docs build .tox .eggs
 minversion = 3.8.2
 testpaths = tests/
-junit_family=xunit2
 xfail_strict = true
 markers =
     dev_mode: mark test to run in dev mode.