diff --git a/.coveragerc b/.coveragerc
index 65e13c2234b..409fde55643 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -9,6 +9,7 @@ omit =
     ${INITIAL_PWD-.}/.github/*
     ${INITIAL_PWD-.}/bin.*/*
     ${INITIAL_PWD-.}/dist.*/*
+    **/gui/wxpython/*/**
     **/OBJ.*/*
 source =
     .
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index f0cda6a95f5..8dfd0b69317 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -83,8 +83,13 @@ jobs:
         run: |
           export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
           export LD_LIBRARY_PATH=$(grass --config path)/lib:$LD_LIBRARY_PATH
+          export INITIAL_GISBASE="$(grass --config path)"
+          export INITIAL_PWD="${PWD}"
           pytest --verbose --color=yes --durations=0 --durations-min=0.5 \
-            --numprocesses auto -ra . \
+            --numprocesses auto \
+            --cov \
+            --cov-context=test \
+            -ra . \
             -m 'not needs_solo_run'
 
       - name: Run pytest with a single worker (for tests marked with needs_solo_run)
@@ -92,9 +97,11 @@ jobs:
           export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
           export LD_LIBRARY_PATH=$(grass --config path)/lib:$LD_LIBRARY_PATH
           export INITIAL_GISBASE="$(grass --config path)"
-          INITIAL_PWD="${PWD}" pytest --verbose --color=yes --durations=0 --durations-min=0.5 \
+          export INITIAL_PWD="${PWD}"
+          pytest --verbose --color=yes --durations=0 --durations-min=0.5 \
             --cov \
             --cov-context=test \
+            --cov-append \
             -ra . \
             -m 'needs_solo_run'
       - name: Fix non-standard installed script paths in coverage data
diff --git a/utils/coverage_mapper.py b/utils/coverage_mapper.py
index 9a2f1389781..88fa30f9b54 100644
--- a/utils/coverage_mapper.py
+++ b/utils/coverage_mapper.py
@@ -22,12 +22,14 @@ def map_scripts_paths(old_path):
     if INITIAL_GISBASE is None or INITIAL_PWD is None:
         return old_path
     p = Path(old_path)
+    extension = ".py"
+    p_name = p.stem if p.suffix == extension else p.name
     temporal_base = Path(INITIAL_GISBASE) / "scripts" / "t.*"
     base = Path(INITIAL_GISBASE) / "scripts" / "*"
     if p.match(str(temporal_base)):
-        return str(Path(INITIAL_PWD) / "temporal" / (p.name) / (p.name)) + ".py"
+        return str(Path(INITIAL_PWD) / "temporal" / (p_name) / (p_name)) + extension
     if p.match(str(base)):
-        return str(Path(INITIAL_PWD) / "scripts" / (p.name) / (p.name)) + ".py"
+        return str(Path(INITIAL_PWD) / "scripts" / (p_name) / (p_name)) + extension
 
     return old_path