diff --git a/.github/workflows/unittest-mpich.yml b/.github/workflows/unittest-mpich.yml
index e73ced83..c8312a9c 100644
--- a/.github/workflows/unittest-mpich.yml
+++ b/.github/workflows/unittest-mpich.yml
@@ -59,4 +59,4 @@ jobs:
     - name: Test
       shell: bash -l {0}
       timeout-minutes: 30
-      run: for f in $(ls tests/test_*.py); do python -m unittest $f; done
+      run: python -m unittest discover tests
diff --git a/.github/workflows/unittest-openmpi.yml b/.github/workflows/unittest-openmpi.yml
index 16ebbae0..8d377c89 100644
--- a/.github/workflows/unittest-openmpi.yml
+++ b/.github/workflows/unittest-openmpi.yml
@@ -59,7 +59,7 @@ jobs:
     - name: Test
       shell: bash -l {0}
       timeout-minutes: 30
-      run: for f in $(ls tests/test_*.py); do coverage run --omit pympipool/_version.py -m unittest $f; done
+      run: coverage run --omit pympipool/_version.py -m unittest discover tests
       env:
         OMPI_MCA_plm: 'isolated'
         OMPI_MCA_rmaps_base_oversubscribe: 'yes'
diff --git a/.github/workflows/unittest-win.yml b/.github/workflows/unittest-win.yml
index d80489b2..8ea85d67 100644
--- a/.github/workflows/unittest-win.yml
+++ b/.github/workflows/unittest-win.yml
@@ -34,4 +34,4 @@ jobs:
     - name: Test
       shell: bash -l {0}
       timeout-minutes: 30
-      run: for f in $(ls tests/test_*.py); do python -m unittest $f; done
+      run: python -m unittest discover tests