diff --git a/mpi/inner_script.sh b/mpi/inner_script.sh
index 350f45c..abe5776 100755
--- a/mpi/inner_script.sh
+++ b/mpi/inner_script.sh
@@ -22,7 +22,7 @@ cp -r $MPI_TESTS_DIRECTORY/* $FTC_DIRECTORY/$NAME
 cd $FTC_DIRECTORY/$NAME || die "Could not find $FTC_DIRECTORY/$NAME"
 echo "Running with $1 compiler and $2 MPI"
 flux bulksubmit -n1 --watch mpicc -o {} {}.c ::: $TESTS || die "Compilation failure in tests"
-flux bulksubmit --watch -N $BATCH_NNODES -n $BATCH_NCORES --output=kvs ./{} ::: $TESTS
+flux bulksubmit --watch -N $BATCH_NNODES -n $BATCH_NCORES $EXTRA_FLUX_SUBMIT_OPTIONS --output=kvs ./{} ::: $TESTS
 RC=$?
 rm -rf $FTC_DIRECTORY/$NAME
 exit $RC
diff --git a/mpi/outer_script.sh b/mpi/outer_script.sh
index 86c5bc7..b351e01 100755
--- a/mpi/outer_script.sh
+++ b/mpi/outer_script.sh
@@ -10,6 +10,7 @@ intel-classic
 
 corona_MPIS="
 mvapich2
+openmpi
 "
 
 export TESTS="hello
@@ -22,7 +23,11 @@ COMPILERS="${LCSCHEDCLUSTER}_COMPILERS"
 
 for mpi in ${!MPIS}; do
     for compiler in ${!COMPILERS}; do
-        flux batch -N2 -n4 --flags=waitable --output=kvs $MPI_TESTS_DIRECTORY/inner_script.sh $mpi $compiler
+        if [[ $mpi == "openmpi" ]]; then
+            EXTRA_FLUX_SUBMIT_OPTIONS="-o pmi=pmix" flux batch -N2 -n4 --flags=waitable --output=kvs $MPI_TESTS_DIRECTORY/inner_script.sh $mpi $compiler
+        else
+            flux batch -N2 -n4 --flags=waitable --output=kvs $MPI_TESTS_DIRECTORY/inner_script.sh $mpi $compiler
+        fi 
     done
 done
 flux job wait --all