diff --git a/integration/v7/selfcontained/kubernetes_auth_test.go b/integration/v7/selfcontained/kubernetes_auth_test.go
index dfaa8d8bfa0..113c8e4f175 100644
--- a/integration/v7/selfcontained/kubernetes_auth_test.go
+++ b/integration/v7/selfcontained/kubernetes_auth_test.go
@@ -4,15 +4,14 @@ import (
 	"net/http"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.com/onsi/gomega/gexec"
-	apiv1 "k8s.io/client-go/tools/clientcmd/api/v1"
-
 	"code.cloudfoundry.org/cli/integration/helpers"
 	"code.cloudfoundry.org/cli/integration/v7/selfcontained/fake"
 	"code.cloudfoundry.org/cli/resources"
 	"code.cloudfoundry.org/cli/util/configv3"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega/gexec"
+	apiv1 "k8s.io/client-go/tools/clientcmd/api/v1"
 )
 
 var _ = Describe("auth-provider", func() {
@@ -30,19 +29,13 @@ var _ = Describe("auth-provider", func() {
 						"resources":  []resources.Application{},
 					},
 				},
-				"GET /whoami": {
-					Code: http.StatusOK, Body: map[string]interface{}{
-						"name": "my-user",
-						"kind": "User",
-					},
-				},
 			},
 		}
 		apiServer.SetConfiguration(apiConfig)
 		helpers.SetConfig(func(config *configv3.Config) {
 			config.ConfigFile.Target = apiServer.URL()
 			config.ConfigFile.CFOnK8s.Enabled = true
-			config.ConfigFile.CFOnK8s.AuthInfo = "my-user"
+			config.ConfigFile.CFOnK8s.AuthInfo = "one"
 			config.ConfigFile.TargetedOrganization = configv3.Organization{
 				GUID: "my-org",
 				Name: "My Org",
@@ -59,8 +52,7 @@ var _ = Describe("auth-provider", func() {
 			APIVersion: "v1",
 			AuthInfos: []apiv1.NamedAuthInfo{
 				{
-					Name: "my-user",
-					AuthInfo: apiv1.AuthInfo{
+					Name: "one", AuthInfo: apiv1.AuthInfo{
 						AuthProvider: &apiv1.AuthProviderConfig{
 							Name: "oidc",
 							Config: map[string]string{
diff --git a/integration/v7/selfcontained/login_command_test.go b/integration/v7/selfcontained/login_command_test.go
index 5def6b7b457..5e41d783fec 100644
--- a/integration/v7/selfcontained/login_command_test.go
+++ b/integration/v7/selfcontained/login_command_test.go
@@ -6,17 +6,16 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.com/onsi/gomega/gbytes"
-	"github.com/onsi/gomega/gexec"
-	apiv1 "k8s.io/client-go/tools/clientcmd/api/v1"
-
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
 	"code.cloudfoundry.org/cli/integration/helpers"
 	"code.cloudfoundry.org/cli/integration/v7/selfcontained/fake"
 	"code.cloudfoundry.org/cli/resources"
 	"code.cloudfoundry.org/cli/util/configv3"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega/gbytes"
+	"github.com/onsi/gomega/gexec"
+	apiv1 "k8s.io/client-go/tools/clientcmd/api/v1"
 )
 
 var _ = Describe("LoginCommand", func() {
@@ -46,12 +45,6 @@ var _ = Describe("LoginCommand", func() {
 							"resources":  []resources.Organization{},
 						},
 					},
-					"GET /whoami": {
-						Code: http.StatusOK, Body: map[string]interface{}{
-							"name": "two",
-							"kind": "User",
-						},
-					},
 				},
 			}
 			apiServer.SetConfiguration(apiConfig)
diff --git a/integration/v7/selfcontained/logout_command_test.go b/integration/v7/selfcontained/logout_command_test.go
index b607be4146a..55e53f35a5d 100644
--- a/integration/v7/selfcontained/logout_command_test.go
+++ b/integration/v7/selfcontained/logout_command_test.go
@@ -1,86 +1,23 @@
 package selfcontained_test
 
 import (
-	"net/http"
-	"path/filepath"
-
+	"code.cloudfoundry.org/cli/integration/helpers"
+	"code.cloudfoundry.org/cli/util/configv3"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
-	apiv1 "k8s.io/client-go/tools/clientcmd/api/v1"
-
-	"code.cloudfoundry.org/cli/integration/helpers"
-	"code.cloudfoundry.org/cli/integration/v7/selfcontained/fake"
-	"code.cloudfoundry.org/cli/util/configv3"
 )
 
 var _ = Describe("cf logout", func() {
 	BeforeEach(func() {
 		helpers.SetConfig(func(config *configv3.Config) {
 			config.ConfigFile.CFOnK8s.Enabled = true
-			config.ConfigFile.CFOnK8s.AuthInfo = "my-user"
+			config.ConfigFile.CFOnK8s.AuthInfo = "something"
 		})
-
-		apiServer.SetConfiguration(fake.CFAPIConfig{Routes: map[string]fake.Response{
-			"GET /whoami": {
-				Code: http.StatusOK, Body: map[string]interface{}{
-					"name": "my-user",
-					"kind": "User",
-				},
-			},
-		}})
-
-		kubeConfig := apiv1.Config{
-			Kind:       "Config",
-			APIVersion: "v1",
-			AuthInfos: []apiv1.NamedAuthInfo{
-				{
-					Name: "my-user",
-					AuthInfo: apiv1.AuthInfo{
-						AuthProvider: &apiv1.AuthProviderConfig{
-							Name: "oidc",
-							Config: map[string]string{
-								"id-token":       string(token),
-								"idp-issuer-url": "-",
-								"client-id":      "-",
-							},
-						},
-					},
-				},
-			},
-			Clusters: []apiv1.NamedCluster{
-				{
-					Name: "my-cluster",
-					Cluster: apiv1.Cluster{
-						Server: "https://example.org",
-					},
-				},
-			},
-			Contexts: []apiv1.NamedContext{
-				{
-					Name: "my-context",
-					Context: apiv1.Context{
-						Cluster:   "my-cluster",
-						AuthInfo:  "my-auth-info",
-						Namespace: "my-namespace",
-					},
-				},
-			},
-			CurrentContext: "my-context",
-		}
-
-		kubeConfigPath := filepath.Join(homeDir, ".kube", "config")
-		storeKubeConfig(kubeConfig, kubeConfigPath)
-
-		env = helpers.CFEnv{
-			EnvVars: map[string]string{
-				"KUBECONFIG": kubeConfigPath,
-			},
-		}
 	})
 
 	JustBeforeEach(func() {
-		Eventually(helpers.CustomCF(env, "logout")).Should(gexec.Exit(0))
+		Eventually(helpers.CF("logout")).Should(gexec.Exit(0))
 	})
 
 	It("clears the auth-info", func() {