diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
index 13ebbaf3..51a1bba6 100644
--- a/.github/workflows/pythonapp.yml
+++ b/.github/workflows/pythonapp.yml
@@ -28,6 +28,7 @@ jobs:
     strategy:
       matrix:
         ki_release: [latest, ki6]
+        w_tests: [g1, g2, g3]
 
     runs-on: ubuntu-latest
     container: setsoft/kicad_auto_test:${{ matrix.ki_release }}
@@ -57,23 +58,21 @@ jobs:
         # pytest --log-cli-level debug -k "test_ibom_parse_fail" --test_dir=output
         # Run the 90% faster tests (under 3 s)
         # Do it in parallel
-        pytest -v --durations=0 -m "not slow" -n 2 --test_dir=output
-        # Run the slowest at the end and exit on the first error
-        pytest -v --durations=0 -m slow -x --test_dir=output
+        ./${{ matrix.w_tests }}.sh
         python3-coverage combine
         python3-coverage report
-        python3-coverage html -d output/htmlcov
+        python3-coverage html -d output/htmlcov_${{ matrix.w_tests }}
     - name: Store results
       if: ${{ always() }}
       uses: actions/upload-artifact@v3
       with:
-        name: Test_Output_${{ matrix.ki_release }}
+        name: Test_Output_${{ matrix.ki_release }}_${{ matrix.w_tests }}
         # Important! empty directories are skipped!!!!
         path: output
     - name: Upload Coverage
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-        COVERALLS_FLAG_NAME: ${{ matrix.ki_release }}
+        COVERALLS_FLAG_NAME: ${{ matrix.ki_release }}_${{ matrix.w_tests }}
         COVERALLS_PARALLEL: true
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
diff --git a/g1.sh b/g1.sh
new file mode 100755
index 00000000..548abf35
--- /dev/null
+++ b/g1.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Fast tests
+pytest -v --durations=0 -m "not slow" -n 2 --test_dir=output
+# KiCad2Step tests
+pytest -v --durations=0 -m "slow and (not (pcbnew or eeschema))" --test_dir=output
diff --git a/g2.sh b/g2.sh
new file mode 100755
index 00000000..12385b90
--- /dev/null
+++ b/g2.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# Eeschema tests
+pytest -v --durations=0 -m "eeschema" --test_dir=output
diff --git a/g3.sh b/g3.sh
new file mode 100755
index 00000000..f1ac6bbb
--- /dev/null
+++ b/g3.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# PCBnew tests
+pytest -v --durations=0 -m "pcbnew" --test_dir=output