diff --git a/build.sh b/build.sh
index 7c63a1434..77705f46a 100755
--- a/build.sh
+++ b/build.sh
@@ -128,7 +128,7 @@ case "${1:-default}" in
 				&& go run build.go -race \
 				&& export GOPATH=$(pwd)/Godeps/_workspace:$GOPATH \
 				&& cd test \
-				&& go test -tags integration -v'
+				&& go test -tags integration -v -timeout 30m'
 		;;
 
 	*)
diff --git a/test/common_test.go b/test/common_test.go
index 796ec04ce..108ba8bf8 100644
--- a/test/common_test.go
+++ b/test/common_test.go
@@ -227,12 +227,6 @@ func (p *syncthingProcess) version() (string, error) {
 	return v.Version, nil
 }
 
-type fileGenerator struct {
-	files   int
-	maxexp  int
-	srcname string
-}
-
 func generateFiles(dir string, files, maxexp int, srcname string) error {
 	fd, err := os.Open(srcname)
 	if err != nil {
diff --git a/test/filetype_test.go b/test/filetype_test.go
index 501e0aa7c..e3f3ddd24 100644
--- a/test/filetype_test.go
+++ b/test/filetype_test.go
@@ -34,7 +34,7 @@ func TestFiletypeChange(t *testing.T) {
 	}
 
 	log.Println("Generating files...")
-	err = generateFiles("s1", 100, 20, "../bin/syncthing")
+	err = generateFiles("s1", 100, 20, "../LICENSE")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/test/manypeers_test.go b/test/manypeers_test.go
index 612a8619c..9621d9bf2 100644
--- a/test/manypeers_test.go
+++ b/test/manypeers_test.go
@@ -38,7 +38,7 @@ func TestManyPeers(t *testing.T) {
 	}
 
 	log.Println("Generating files...")
-	err = generateFiles("s1", 200, 20, "../bin/syncthing")
+	err = generateFiles("s1", 200, 20, "../LICENSE")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/test/reconnect_test.go b/test/reconnect_test.go
index 6db8c1d28..04ac3dc05 100644
--- a/test/reconnect_test.go
+++ b/test/reconnect_test.go
@@ -48,7 +48,7 @@ func testRestartDuringTransfer(t *testing.T, restartSender, restartReceiver bool
 	}
 
 	log.Println("Generating files...")
-	err = generateFiles("s1", 1000, 22, "../bin/syncthing")
+	err = generateFiles("s1", 1000, 22, "../LICENSE")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/test/symlink_test.go b/test/symlink_test.go
index de4e77d20..26054b6ab 100644
--- a/test/symlink_test.go
+++ b/test/symlink_test.go
@@ -35,7 +35,7 @@ func TestSymlinks(t *testing.T) {
 	}
 
 	log.Println("Generating files...")
-	err = generateFiles("s1", 100, 20, "../bin/syncthing")
+	err = generateFiles("s1", 100, 20, "../LICENSE")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/test/transfer-bench_test.go b/test/transfer-bench_test.go
index f78ea1ff8..272969744 100644
--- a/test/transfer-bench_test.go
+++ b/test/transfer-bench_test.go
@@ -37,7 +37,7 @@ func TestBenchmarkTransfer(t *testing.T) {
 	}
 
 	log.Println("Generating files...")
-	err = generateFiles("s1", nfiles, 22, "../bin/syncthing")
+	err = generateFiles("s1", nfiles, 22, "../LICENSE")
 	if err != nil {
 		t.Fatal(err)
 	}