diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
index d66727156e..fffd209d04 100644
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -106,7 +106,7 @@ func startComponents(manifestURL string) (apiServerURL string) {
 		}
 	}
 
-	cl := client.NewOrDie(apiServer.URL, "", nil)
+	cl := client.NewOrDie(api.NewContext(), apiServer.URL, "", nil)
 	cl.PollPeriod = time.Second * 1
 	cl.Sync = true
 
@@ -311,7 +311,7 @@ func main() {
 	// Wait for the synchronization threads to come up.
 	time.Sleep(time.Second * 10)
 
-	kubeClient := client.NewOrDie(apiServerURL, "", nil)
+	kubeClient := client.NewOrDie(api.NewContext(), apiServerURL, "", nil)
 
 	// Run tests in parallel
 	testFuncs := []testFunc{
diff --git a/test/integration/client_test.go b/test/integration/client_test.go
index b5cd44fec6..07640d4afb 100644
--- a/test/integration/client_test.go
+++ b/test/integration/client_test.go
@@ -61,7 +61,7 @@ func TestClient(t *testing.T) {
 	for apiVersion, values := range testCases {
 		deleteAllEtcdKeys()
 		s := httptest.NewServer(apiserver.Handle(values.Storage, values.Codec, fmt.Sprintf("/api/%s/", apiVersion), values.selfLinker))
-		client := client.NewOrDie(s.URL, apiVersion, nil)
+		client := client.NewOrDie(api.NewContext(), s.URL, apiVersion, nil)
 
 		info, err := client.ServerVersion()
 		if err != nil {