diff --git a/build.go b/build.go
index ee9a075c2..32639b8ee 100644
--- a/build.go
+++ b/build.go
@@ -181,7 +181,7 @@ func setup() {
 
 func test(pkg string) {
 	setBuildEnv()
-	runPrint("go", "test", "-short", "-timeout", "10s", pkg)
+	runPrint("go", "test", "-short", "-timeout", "60s", pkg)
 }
 
 func install(pkg string, tags []string) {
diff --git a/build.sh b/build.sh
index 78acaad54..f5ffe76f1 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 -timeout 30m -short'
+				&& go test -tags integration -v -timeout 60m -short'
 		;;
 
 	*)