diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 85ff7e8dc..247116aef 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,8 +28,8 @@ jobs:
       - name: Test
         run: bash scripts/test.sh
         env:
-          COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
-          CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
+          COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-click-7-${{ matrix.click-7 }}
+          CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}-click-7-${{ matrix.click-7 }}
       - name: Store coverage files
         uses: actions/upload-artifact@v3
         with:
diff --git a/pyproject.toml b/pyproject.toml
index 7a76b21b7..154b0a037 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -53,6 +53,7 @@ test = [
     "isort ~= 5.10.1",
     "mypy ~= 0.950",
     "pytest ~= 7.1.2",
+    "pytest-cov ~= 3.0.0",
     "pytest-sugar ~= 0.9.4",
     "pytest-xdist ~= 2.1.0",
     "shellingham ~= 1.4.0",
diff --git a/scripts/test-cov-html.sh b/scripts/test-cov-html.sh
index d1bdfced2..7957277fc 100755
--- a/scripts/test-cov-html.sh
+++ b/scripts/test-cov-html.sh
@@ -3,7 +3,4 @@
 set -e
 set -x
 
-bash scripts/test.sh ${@}
-coverage combine
-coverage report --show-missing
-coverage html
+bash scripts/test.sh --cov-report=html ${@}
diff --git a/scripts/test.sh b/scripts/test.sh
index ceba6bf7d..fc566b8c0 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -5,4 +5,4 @@ set -x
 
 bash ./scripts/test-files.sh
 # Use xdist-pytest --forked to ensure modified sys.path to import relative modules in examples keeps working
-coverage run -m pytest -o console_output_style=progress --forked --numprocesses=auto ${@}
+pytest --cov=typer --cov=tests --cov=docs_src --cov-report=term-missing -o console_output_style=progress --numprocesses=auto ${@}