diff --git a/.travis.yml b/.travis.yml
index cbbc45a29dcce..4d5720166981c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ language: go
 
 matrix:
   include:
-    - go: 1.4
+    - go: 1.6
 
 install:
   - mkdir -p $HOME/gopath/src/k8s.io
@@ -24,8 +24,8 @@ install:
   - go get github.com/mattn/goveralls
   - go get github.com/jstemmer/go-junit-report
   - ./hack/install-etcd.sh
-  - ./hack/build-go.sh
-  - godep go install ./...
+  - travis_wait 30 ./hack/build-go.sh
+  - travis_wait 30 godep go install ./...
   - ./hack/verify-gofmt.sh
   - ./hack/verify-boilerplate.sh
   - ./hack/verify-description.sh
diff --git a/cmd/libs/go2idl/import-boss/generators/import_restrict.go b/cmd/libs/go2idl/import-boss/generators/import_restrict.go
index db5ba517c8d6b..afad1ca14046b 100644
--- a/cmd/libs/go2idl/import-boss/generators/import_restrict.go
+++ b/cmd/libs/go2idl/import-boss/generators/import_restrict.go
@@ -32,7 +32,6 @@ import (
 	"k8s.io/kubernetes/cmd/libs/go2idl/generator"
 	"k8s.io/kubernetes/cmd/libs/go2idl/namer"
 	"k8s.io/kubernetes/cmd/libs/go2idl/types"
-
 	//"github.com/golang/glog"
 )
 
diff --git a/cmd/libs/go2idl/parser/parse_test.go b/cmd/libs/go2idl/parser/parse_test.go
index c20edd666f6eb..044b6d558c5fb 100644
--- a/cmd/libs/go2idl/parser/parse_test.go
+++ b/cmd/libs/go2idl/parser/parse_test.go
@@ -153,10 +153,10 @@ var FooAnotherVar proto.Frobber = proto.AnotherVar
 	tmpl := template.Must(
 		template.New("").
 			Funcs(
-			map[string]interface{}{
-				"Name": testNamer.Name,
-				"Raw":  rawNamer.Name,
-			}).
+				map[string]interface{}{
+					"Name": testNamer.Name,
+					"Raw":  rawNamer.Name,
+				}).
 			Parse(tmplText),
 	)
 	buf := &bytes.Buffer{}
diff --git a/pkg/kubelet/config/common_test.go b/pkg/kubelet/config/common_test.go
index 5265fca36750b..a56d48bc9e834 100644
--- a/pkg/kubelet/config/common_test.go
+++ b/pkg/kubelet/config/common_test.go
@@ -26,7 +26,6 @@ import (
 	"k8s.io/kubernetes/pkg/apimachinery/registered"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/securitycontext"
-
 	//"github.com/ghodss/yaml"
 )