diff --git a/test/run b/test/run
index 29a7905f0a4..d206312a29c 100755
--- a/test/run
+++ b/test/run
@@ -54,6 +54,8 @@ true >pass.out >times.out
 exclude=false	# exclude nothing
 golden=golden.out
 
+rm -f tmp.go  # generated by some tests, left behind if interrupted
+
 filterout() {
 	grep '^'"$2"'$' $1 >/dev/null
 }
diff --git a/test/testlib b/test/testlib
index 90f400dd891..29de7672ce1 100644
--- a/test/testlib
+++ b/test/testlib
@@ -12,7 +12,7 @@ compile() {
 compiledir() {
 	for gofile in $D/$F.dir/*.go
 	do
-		$G ${gofile} || return 1
+		$G -I. "$gofile" || return 1
 	done
 }