diff --git a/src/Makefile.in b/src/Makefile.in
index 5934c7bae0a13a68f894b5489fb69070a3a7af78..dfe2b0bf864cb7bef2e562fa9e0e8e495297f892 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.in,v 1.67 1998/04/02 16:38:34 grubba Exp $
+# $Id: Makefile.in,v 1.68 1998/04/08 08:13:21 hubbe Exp $
 #
 
 # This line is needed on some machines.
@@ -448,6 +448,6 @@ stamp-h: $(SRCDIR)/machine.h.in config.status
 	CONFIG_FILES="" CONFIG_HEADERS=machine.h ./config.status
 
 testsuite: $(SRCDIR)/testsuite.in
-	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >testsuite
+	$(TMP_BINDIR)/mktestsuite $(SRCDIR)/testsuite.in >testsuite -DSRCDIR="$(SRCDIR)" -DRUNPIKE="$(RUNPIKE)"
 
 @dependencies@
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index 58211e0576717ee986f56324e1ba42bdd4e6732d..8042aa8dbe156d541ecef78b8f27dad2e8a26226 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.16 1998/03/28 13:43:42 grubba Exp $
+# $Id: Makefile.in,v 1.17 1998/04/08 08:13:51 hubbe Exp $
 
 @SET_MAKE@
 
@@ -49,7 +49,7 @@ verbose_verify:
 	for a in $(MODULES) ; do ( cd $$a ; ${MAKE} $(MAKE_FLAGS) MODNAME=$$a verbose_verify ) || exit $$? ; done
 
 testsuites:
-	for a in $(MODULES) ; do $(TMP_BINDIR)/mktestsuite $(SRCDIR)/$$a/testsuite.in >$$a/module_testsuite -DSRCDIR=$(SRCDIR)/$$a  || exit $$? ; done
+	for a in $(MODULES) ; do $(TMP_BINDIR)/mktestsuite $(SRCDIR)/$$a/testsuite.in >$$a/module_testsuite -DSRCDIR=$(SRCDIR)/$$a -DRUNPIKE="$(RUNPIKE)" || exit $$? ; done
 
 extra_tests:
 	for a in $(MODULES) ; do ( cd $$a ; ${MAKE} $(MAKE_FLAGS) MODNAME=$$a extra_tests ) || exit $$? ; done
diff --git a/src/testsuite.in b/src/testsuite.in
index 1ad712f4f5661705e4d85718c7104105bab9f6dd..d6e268bed52ab94a78b22c00150e9acfb8559f15 100644
--- a/src/testsuite.in
+++ b/src/testsuite.in
@@ -1,4 +1,4 @@
-test_true([["$Id: testsuite.in,v 1.84 1998/04/07 03:51:41 hubbe Exp $"]])
+test_true([["$Id: testsuite.in,v 1.85 1998/04/08 08:13:21 hubbe Exp $"]])
 test_eq(1e1,10.0)
 test_eq(1E1,10.0)
 test_eq(1e+1,10.0)
@@ -1929,3 +1929,6 @@ test_true(Process.popen)
 test_true(Process.spawn)
 test_true(Process.system)
 test_true(Process.create_process)
+test_false([[Process.system("]]RUNPIKE[[ -e 'exit(0)'")]])
+test_true([[Process.system("]]RUNPIKE[[ -e 'exit(1)'")]])
+test_eq([[Process.popen("]]RUNPIKE[[ -e 'write(\"test\");'")]],"test")