diff --git a/pkg/minikube/bootstrapper/kubeadm/util.go b/pkg/minikube/bootstrapper/kubeadm/util.go
index 2da2b3289b..5decf83699 100644
--- a/pkg/minikube/bootstrapper/kubeadm/util.go
+++ b/pkg/minikube/bootstrapper/kubeadm/util.go
@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"html/template"
+	"net"
 	"strings"
 
 	"github.com/golang/glog"
@@ -122,6 +123,10 @@ func elevateKubeSystemPrivileges() error {
 	}
 	_, err = client.RbacV1beta1().ClusterRoleBindings().Create(clusterRoleBinding)
 	if err != nil {
+		netErr, ok := err.(net.Error)
+		if ok && netErr.Timeout() {
+			return &util.RetriableError{Err: errors.Wrap(err, "creating clusterrolebinding")}
+		}
 		return errors.Wrap(err, "creating clusterrolebinding")
 	}
 	return nil
diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go
index 66a6313042..0b9966dc58 100644
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@@ -118,7 +118,7 @@ const (
 	GithubMinikubeReleasesURL  = "https://storage.googleapis.com/minikube/releases.json"
 	DefaultWait                = 20
 	DefaultInterval            = 6
-	DefaultK8sClientTimeout    = 10 * time.Second
+	DefaultK8sClientTimeout    = 60 * time.Second
 	DefaultClusterBootstrapper = "kubeadm"
 )
 
diff --git a/test/integration/tunnel_test.go b/test/integration/tunnel_test.go
index 89b856471f..97ac40dfb9 100644
--- a/test/integration/tunnel_test.go
+++ b/test/integration/tunnel_test.go
@@ -46,7 +46,9 @@ func testTunnel(t *testing.T) {
 	runner := NewMinikubeRunner(t)
 	go func() {
 		output := runner.RunCommand("tunnel --alsologtostderr -v 8 --logtostderr", true)
-		t.Log(output)
+		if t.Failed() {
+			fmt.Println(output)
+		}
 	}()
 
 	err := tunnel.NewManager().CleanupNotRunningTunnels()