diff --git a/configure.ac b/configure.ac
index ec0262495f9..ed92324e342 100644
--- a/configure.ac
+++ b/configure.ac
@@ -403,6 +403,8 @@ AC_CONFIG_FILES([tests/general/pio_tutil.F90:tests/general/util/pio_tutil.F90])
 AC_CONFIG_FILES([tests/cunit/run_tests.sh], [chmod ugo+x tests/cunit/run_tests.sh])
 AC_CONFIG_FILES([tests/ncint/run_tests.sh], [chmod ugo+x tests/ncint/run_tests.sh])
 AC_CONFIG_FILES([tests/ncint/run_perf.sh], [chmod ugo+x tests/ncint/run_perf.sh])
+AC_CONFIG_FILES([tests/fncint/run_tests.sh], [chmod ugo+x tests/fncint/run_tests.sh])
+AC_CONFIG_FILES([tests/general/run_tests.sh], [chmod ugo+x tests/general/run_tests.sh])
 AC_CONFIG_FILES([tests/unit/run_tests.sh], [chmod ugo+x tests/unit/run_tests.sh])
 AC_CONFIG_FILES([examples/c/run_tests.sh], [chmod ugo+x examples/c/run_tests.sh])
 
diff --git a/tests/fncint/Makefile.am b/tests/fncint/Makefile.am
index 086b11ebaf7..3437e54570c 100644
--- a/tests/fncint/Makefile.am
+++ b/tests/fncint/Makefile.am
@@ -33,3 +33,5 @@ EXTRA_DIST = run_tests.sh
 
 # Clean up files produced during testing.
 CLEANFILES = *.nc *.log
+
+DISTCLEANFILES = run_tests.sh
diff --git a/tests/fncint/run_tests.sh b/tests/fncint/run_tests.sh.in
similarity index 90%
rename from tests/fncint/run_tests.sh
rename to tests/fncint/run_tests.sh.in
index 1c4121b9155..4d9ea52e636 100755
--- a/tests/fncint/run_tests.sh
+++ b/tests/fncint/run_tests.sh.in
@@ -16,7 +16,7 @@ for TEST in $PIO_TESTS
 do
     success1=false
     echo "running ${TEST}"
-    mpiexec -n 4 ./${TEST} && success1=true
+    @WITH_MPIEXEC@ -n 4 ./${TEST} && success1=true
     if test $success1 = false; then
         break
     fi
diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index 35779ca5b7a..2a198588898 100644
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -89,7 +89,7 @@ pio_rearr_opts2.F90:pio_rearr_opts2.F90.in
 pio_rearr_opts.F90:pio_rearr_opts.F90.in
 
 # Distribute the test script.
-EXTRA_DIST = CMakeLists.txt run_tests.sh ncdf_fail.F90.in		\
+EXTRA_DIST = CMakeLists.txt run_tests.sh.in ncdf_fail.F90.in		\
 ncdf_get_put.F90.in ncdf_inq.F90.in ncdf_simple_tests.F90.in		\
 pio_decomp_fillval.F90.in pio_decomp_frame_tests.F90.in			\
 pio_decomp_tests_1d.F90.in pio_decomp_tests_2d.F90.in			\
@@ -101,3 +101,5 @@ pio_rearr_opts2.F90.in pio_rearr_opts.F90.in
 
 # Clean up files produced during testing.
 CLEANFILES = *.nc *.log *.mod
+
+DISTCLEANFILES = run_tests.sh
diff --git a/tests/general/run_tests.sh b/tests/general/run_tests.sh.in
similarity index 94%
rename from tests/general/run_tests.sh
rename to tests/general/run_tests.sh.in
index 63d89e56092..b847f84acc8 100755
--- a/tests/general/run_tests.sh
+++ b/tests/general/run_tests.sh.in
@@ -23,7 +23,7 @@ for TEST in $PIO_TESTS
 do
     success1=false
     echo "running ${TEST}"
-    mpiexec -n 4 ./${TEST} && success1=true
+    @WITH_MPIEXEC@ -n 4 ./${TEST} && success1=true
     if test $success1 = false; then
         break
     fi