diff --git a/pkg/apiserver/validator.go b/pkg/apiserver/validator.go
index 5e1870ac87d..05fa79bf2ff 100644
--- a/pkg/apiserver/validator.go
+++ b/pkg/apiserver/validator.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	probeTimeOut = time.Minute
+	probeTimeOut = 20 * time.Second
 )
 
 // TODO: this basic interface is duplicated in N places.  consolidate?
diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go
index c1e20fda2d8..23d82c58bb9 100644
--- a/pkg/genericapiserver/genericapiserver.go
+++ b/pkg/genericapiserver/genericapiserver.go
@@ -58,6 +58,7 @@ import (
 
 const (
 	DefaultEtcdPathPrefix = "/registry"
+	globalTimeout         = time.Minute
 )
 
 // StorageDestinations is a mapping from API group & resource to
@@ -662,7 +663,7 @@ func (s *GenericAPIServer) Run(options *ServerRunOptions) {
 		if longRunningRequestCheck(req) {
 			return nil, ""
 		}
-		return time.After(time.Minute), ""
+		return time.After(globalTimeout), ""
 	}
 
 	if secureLocation != "" {