diff --git a/tools/runtest b/tools/runtest
index 65022f1..e14d640 100755
--- a/tools/runtest
+++ b/tools/runtest
@@ -48,7 +48,7 @@ platform=$WINETEST_PLATFORM
 WINETEST_DEBUG=${WINETEST_DEBUG:-1}
 
 # parse command-line options
-while [ "$#" -gt 1 ]; do
+while [ "$#" != 0 ]; do
     case "$1" in
     -h)
 	usage
@@ -77,8 +77,12 @@ while [ "$#" -gt 1 ]; do
 	if [ ! -d "$topobjdir" ]; then usage; fi
     ;;
     --)
+	shift
 	break
     ;;
+    *)
+	infile="$1"
+    ;;
     esac
     shift
 done	    
@@ -133,4 +137,8 @@ export WINETEST_PLATFORM WINETEST_DEBUG
 #  WINETEST_WRAPPER=valgrind
 # would run the tests under valgrind to look for memory errors.
 
-exec $WINETEST_WRAPPER "$topobjdir/wine" "$program" "$@"
+if [ -z "$infile" ]; then
+    exec $WINETEST_WRAPPER "$topobjdir/wine" "$program" "$@"
+else
+    exec $WINETEST_WRAPPER "$topobjdir/wine" "$program" "$infile" "$@"
+fi