diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 26eed48da1..b3d5ff32e4 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -316,7 +316,8 @@ jobs:
           -DopenPMD_USE_MPI=ON    \
           -DopenPMD_USE_HDF5=ON   \
           -DopenPMD_USE_ADIOS2=ON \
-          -DopenPMD_USE_INVASIVE_TESTS=ON
+          -DopenPMD_USE_INVASIVE_TESTS=ON \
+          -DMPIEXEC_EXECUTABLE=".github/workflows/mpirun_workaround.sh"
         cmake --build build --parallel 2
         cd build
         ctest --output-on-failure
diff --git a/.github/workflows/mpirun_workaround.sh b/.github/workflows/mpirun_workaround.sh
index cae5a9e791..c67bf49ae4 100755
--- a/.github/workflows/mpirun_workaround.sh
+++ b/.github/workflows/mpirun_workaround.sh
@@ -14,11 +14,6 @@
 # This script provides a workaround by putting the called sub-command into
 # a script in a temporary file.
 
-mpiexec -n 1 ls --all \
-    && echo "MPIRUN WORKING AGAIN, PLEASE REMOVE WORKAROUND" >&2 \
-    && exit 1 \
-    || true
-
 mpirun_args=()
 
 script_file="$(mktemp)"