diff --git a/.github/workflows/ompi_mpi4py.yaml b/.github/workflows/ompi_mpi4py.yaml
index fa7fcf2c84b..40d88e2def0 100644
--- a/.github/workflows/ompi_mpi4py.yaml
+++ b/.github/workflows/ompi_mpi4py.yaml
@@ -131,11 +131,6 @@ jobs:
     # this job of tests to pass.
     needs: [ build ]
     uses: ./.github/workflows/ompi_mpi4py_tests.yaml
-    with:
-      # This parameter is required, so send a meaningless
-      # environment variable name that will not affect the tests at
-      # all (i.e., the tests will be run with default values).
-      env_name: MAKE_TODAY_AN_OMPI_DAY
 
   #==============================================
 
diff --git a/.github/workflows/ompi_mpi4py_tests.yaml b/.github/workflows/ompi_mpi4py_tests.yaml
index 6adabe9cd7f..3d2e9d4f978 100644
--- a/.github/workflows/ompi_mpi4py_tests.yaml
+++ b/.github/workflows/ompi_mpi4py_tests.yaml
@@ -9,7 +9,7 @@ on:
   workflow_call:
     inputs:
       env_name:
-        required: true
+        required: false
         type: string
 
 jobs:
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     env:
-      ${{ inputs.env_name}}: 1
+      ${{ inputs.env_name || 'MAKE_TODAY_AN_OMPI_DAY' }}: 1
     steps:
     - name: Use Python
       uses: actions/setup-python@v5
@@ -67,3 +67,24 @@ jobs:
       run:  python demo/test-run/test_run.py -v
       if:   ${{ true }}
       timeout-minutes: 10
+
+    #----------------------------------------------
+
+    - name: Relocate Open MPI installation
+      run:  mv /opt/openmpi /opt/ompi
+    - name: Update PATH and set OPAL_PREFIX and LD_LIBRARY_PATH
+      run: |
+        sed -i '\|/opt/openmpi/bin|d' $GITHUB_PATH
+        echo OPAL_PREFIX=/opt/ompi >> $GITHUB_ENV
+        echo LD_LIBRARY_PATH=/opt/ompi/lib >> $GITHUB_ENV
+
+    - name: Test mpi4py (singleton)
+      run:  python test/main.py -v
+      if:   ${{ true }}
+      timeout-minutes: 10
+    - name: Test mpi4py (np=5)
+      run:  /opt/ompi/bin/mpiexec -n 5 python test/main.py -v -f
+      if:   ${{ true }}
+      timeout-minutes: 10
+
+    #----------------------------------------------