diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 79d15b0d..ae83a101 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -396,207 +396,207 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "794ec3ffa49dd85eddf72ef4581cb9ba572a6b4c"
+			"Rev": "ef51ab160544f9d05b68e132a4af0b0fab459954"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/tools/clientcmd/client_config_test.go b/tools/clientcmd/client_config_test.go
index a13fe72b..a209da42 100644
--- a/tools/clientcmd/client_config_test.go
+++ b/tools/clientcmd/client_config_test.go
@@ -132,9 +132,17 @@ func TestModifyContext(t *testing.T) {
 		"clean":   true,
 	}
 
+	tempPath, err := ioutil.TempFile("", "testclientcmd-")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	defer os.Remove(tempPath.Name())
+
 	pathOptions := NewDefaultPathOptions()
 	config := createValidTestConfig()
 
+	pathOptions.GlobalFile = tempPath.Name()
+
 	// define new context and assign it - our path options config
 	config.Contexts["updated"] = &clientcmdapi.Context{
 		Cluster:  "updated",