diff --git a/testsuite/lib.test/fileutils.exp b/testsuite/lib.test/fileutils.exp
index 3fab11e2..da4e6e73 100644
--- a/testsuite/lib.test/fileutils.exp
+++ b/testsuite/lib.test/fileutils.exp
@@ -2,18 +2,19 @@
 # Testsuite for lib/fileutils program
 #
 
-set noarg "${topdir}lib/test_fileutils"
+set testprog "${topdir}lib/test_fileutils"
+set scriptdir [file dirname [ info script ]]
 
 set test "without argument"
-spawn $noarg
+spawn $testprog
 expect_pass "$test" "Hello, World!"
 
-set badfd "${topdir}testsuite/lib.test/fileutils_badfd.sh"
+set badfd "${scriptdir}/fileutils_badfd.sh"
 set test "test bad file descriptor"
-spawn $badfd
+spawn $badfd $testprog
 expect_pass "$test" "test_fileutils: write error: Bad file descriptor"
 
-set full "${topdir}testsuite/lib.test/fileutils_full.sh"
+set full "${scriptdir}/fileutils_full.sh"
 set test "test no space left on device"
-spawn $full
+spawn $full $testprog
 expect_pass "$test" "test_fileutils: write error: No space left on device"
diff --git a/testsuite/lib.test/fileutils_badfd.sh b/testsuite/lib.test/fileutils_badfd.sh
index 4a0d5c67..6fffb243 100755
--- a/testsuite/lib.test/fileutils_badfd.sh
+++ b/testsuite/lib.test/fileutils_badfd.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-BASEDIR=$(dirname ${0})
-${BASEDIR}/../../lib/test_fileutils >&-
+TESTPROG=${1}
+${TESTPROG} >&-
diff --git a/testsuite/lib.test/fileutils_full.sh b/testsuite/lib.test/fileutils_full.sh
index 0d96a0dd..dd8f61c7 100755
--- a/testsuite/lib.test/fileutils_full.sh
+++ b/testsuite/lib.test/fileutils_full.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-BASEDIR=$(dirname ${0})
-${BASEDIR}/../../lib/test_fileutils > /dev/full
+TESTPROG=${1}
+${TESTPROG} >/dev/full