diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_.yaml
index 04f6f0d..21f64f7 100644
--- a/.ci_support/osx_.yaml
+++ b/.ci_support/osx_.yaml
@@ -1,5 +1,3 @@
-CONDA_BUILD_SYSROOT:
-- /opt/MacOSX10.10.sdk
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 c_compiler:
diff --git a/recipe/build-mpich.sh b/recipe/build-mpi.sh
similarity index 79%
rename from recipe/build-mpich.sh
rename to recipe/build-mpi.sh
index cefc014..a3ba67f 100755
--- a/recipe/build-mpich.sh
+++ b/recipe/build-mpi.sh
@@ -4,24 +4,20 @@
 # with a fatal deprecation message pointing to FC
 unset F90 F77
 
-# remove --as-needed, which causes problems for downstream builds,
-# seen in failures in petsc, slepc, and hdf5 at least
-export LDFLAGS="${LDFLAGS/-Wl,--as-needed/}"
+export FCFLAGS="$FFLAGS"
 
 # avoid absolute-paths in compilers
 export CC=$(basename "$CC")
 export CXX=$(basename "$CXX")
 export FC=$(basename "$FC")
 
-# from anaconda recipe, not sure if it matters
-export FCFLAGS="$FFLAGS"
-
 # avoid recording flags in compilers
 # See Compiler Flags section of MPICH readme
-export MPICHLIB_CFLAGS=$CFLAGS
-unset CFLAGS
+# TODO: configure ignores MPICHLIB_LDFLAGS
 export MPICHLIB_CPPFLAGS=$CPPFLAGS
 unset CPPFLAGS
+export MPICHLIB_CFLAGS=$CFLAGS
+unset CFLAGS
 export MPICHLIB_CXXFLAGS=$CXXFLAGS
 unset CXXFLAGS
 export MPICHLIB_LDFLAGS=$LDFLAGS
@@ -33,19 +29,20 @@ unset FCFLAGS
 
 # set some specific flags that we *do* want recorded in the compilers
 # only the bare minimum of prefix-awareness here
-export CFLAGS="-I$PREFIX/include"
 export CPPFLAGS="-I$PREFIX/include"
+export CFLAGS="-I$PREFIX/include"
 export CXXFLAGS="-I$PREFIX/include"
 export FFLAGS="-I$PREFIX/include"
+export FCFLAGS="-I$PREFIX/include"
 export LDFLAGS="-L$PREFIX/lib -Wl,-rpath,$PREFIX/lib"
 
 export LIBRARY_PATH="$PREFIX/lib"
 
 ./configure --prefix=$PREFIX \
             --disable-dependency-tracking \
-            --disable-wrapper-rpath \
             --enable-cxx \
-            --enable-fortran
+            --enable-fortran \
+            --disable-wrapper-rpath
 
 make -j"${CPU_COUNT:-1}"
 make install
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 24126aa..4dd1680 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -11,12 +11,12 @@ source:
     sha256: 5db53bf2edfaa2238eb6a0a5bc3d2c2ccbfbb1badd79b664a1a919d2ce2330f1
 
 build:
-    number: 1012
-    skip: True  # [win]
+  number: 1013
+  skip: True  # [win]
 
 outputs:
   - name: mpich
-    script: build-mpich.sh
+    script: build-mpi.sh
     build:
       run_exports:
         - {{ pin_subpackage('mpich', max_pin='x.x') }}
@@ -32,9 +32,8 @@ outputs:
     test:
       script: run_test.sh
       files:
-        - tests/test_exec.py
-      requires:
-        - python >=3
+        - mpiexec.sh
+        - tests/helloworld.sh
 
   - name: mpich-mpicc
     build:
@@ -51,6 +50,7 @@ outputs:
     test:
       script: run_test.sh
       files:
+        - mpiexec.sh
         - tests/helloworld.c
 
   - name: mpich-mpicxx
@@ -68,6 +68,7 @@ outputs:
     test:
       script: run_test.sh
       files:
+        - mpiexec.sh
         - tests/helloworld.cxx
 
   - name: mpich-mpifort
@@ -84,6 +85,7 @@ outputs:
     test:
       script: run_test.sh
       files:
+        - mpiexec.sh
         - tests/helloworld.f
         - tests/helloworld.f90
 
diff --git a/recipe/mpiexec.sh b/recipe/mpiexec.sh
new file mode 100755
index 0000000..26aef3f
--- /dev/null
+++ b/recipe/mpiexec.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -euo pipefail
+# pipe stdout, stderr through cat to avoid O_NONBLOCK issues
+exec mpiexec "$@" 2>&1</dev/null | cat
diff --git a/recipe/run_test.sh b/recipe/run_test.sh
index 0e6eda7..8063814 100755
--- a/recipe/run_test.sh
+++ b/recipe/run_test.sh
@@ -1,48 +1,58 @@
 #!/bin/bash
-set -x
-
-command -v mpichversion
-mpichversion
-
-command -v mpicc
-mpicc -show
-
-command -v mpicxx
-mpicxx -show
-
-command -v mpif90
-mpif90 -show
-
-command -v mpiexec
+set -ex
 
+export HYDRA_LAUNCHER=fork
+MPIEXEC="${PWD}/mpiexec.sh"
 
 pushd "tests"
 
-function mpi_exec() {
-  # use pipes to avoid O_NONBLOCK issues on stdin, stdout
-  mpiexec -launcher fork $@ 2>&1 </dev/null | cat
-}
-
 if [[ $PKG_NAME == "mpich" ]]; then
-  mpi_exec -n 4 python test_exec.py
+  command -v mpichversion
+  mpichversion
+
+  command -v mpiexec
+  $MPIEXEC -n 1 mpivars
+  $MPIEXEC -n 4 ./helloworld.sh
 fi
 
 if [[ $PKG_NAME == "mpich-mpicc" ]]; then
+  command -v mpicc
+  mpicc -show
+
   mpicc $CFLAGS $LDFLAGS helloworld.c -o helloworld_c
-  mpi_exec -n 4 ./helloworld_c
+  $MPIEXEC -n 4 ./helloworld_c
 fi
 
 if [[ $PKG_NAME == "mpich-mpicxx" ]]; then
+  command -v mpicxx
+  mpicxx -show
+
   mpicxx $CXXFLAGS $LDFLAGS helloworld.cxx -o helloworld_cxx
-  mpi_exec -n 4 ./helloworld_cxx
+  $MPIEXEC -n 4 ./helloworld_cxx
 fi
 
 if [[ $PKG_NAME == "mpich-mpifort" ]]; then
-  mpif77 $FFLAGS $LDFLAGS helloworld.f -o helloworld_f
-  mpi_exec -n 4 ./helloworld_f
+  command -v mpifort
+  mpifort -show
+
+  mpifort $FFLAGS $LDFLAGS helloworld.f -o helloworld1_f
+  $MPIEXEC -n 4 ./helloworld1_f
+
+  mpifort $FFLAGS $LDFLAGS helloworld.f90 -o helloworld1_f90
+  $MPIEXEC -n 4 ./helloworld1_f90
+
+  command -v mpif77
+  mpif77 -show
+
+  mpif77 $FFLAGS $LDFLAGS helloworld.f -o helloworld2_f
+  $MPIEXEC -n 4 ./helloworld2_f
+
+  command -v mpif90
+  mpif90 -show
+
+  mpif90 $FFLAGS $LDFLAGS helloworld.f90 -o helloworld2_f90
+  $MPIEXEC -n 4 ./helloworld2_f90
 
-  mpif90 $FFLAGS $LDFLAGS helloworld.f90 -o helloworld_f90
-  mpi_exec -n 4 ./helloworld_f90
 fi
 
 popd
diff --git a/recipe/tests/helloworld.sh b/recipe/tests/helloworld.sh
new file mode 100755
index 0000000..920f947
--- /dev/null
+++ b/recipe/tests/helloworld.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -eu
+rank=$PMI_RANK
+size=$PMI_SIZE
+printf "Hello, World! I am process %d of %d.\n" $rank $size
diff --git a/recipe/tests/test_exec.py b/recipe/tests/test_exec.py
deleted file mode 100644
index a24c3e1..0000000
--- a/recipe/tests/test_exec.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import os
-print(os.getpid())