diff --git a/test/integration/apimachinery/watch_restart_test.go b/test/integration/apimachinery/watch_restart_test.go
index fe599a3c152..dfc4aa81336 100644
--- a/test/integration/apimachinery/watch_restart_test.go
+++ b/test/integration/apimachinery/watch_restart_test.go
@@ -77,8 +77,8 @@ func TestWatchRestartsIfTimeoutNotReached(t *testing.T) {
 		Host: s.URL,
 	}
 
-	namespaceObject := framework.CreateTestingNamespace("retry-watch", s, t)
-	defer framework.DeleteTestingNamespace(namespaceObject, s, t)
+	namespaceObject := framework.CreateTestingNamespace("retry-watch", t)
+	defer framework.DeleteTestingNamespace(namespaceObject, t)
 
 	getListFunc := func(c *kubernetes.Clientset, secret *corev1.Secret) func(options metav1.ListOptions) *corev1.SecretList {
 		return func(options metav1.ListOptions) *corev1.SecretList {
diff --git a/test/integration/apiserver/apiserver_test.go b/test/integration/apiserver/apiserver_test.go
index 37b7ffed5d3..5553e6a5b17 100644
--- a/test/integration/apiserver/apiserver_test.go
+++ b/test/integration/apiserver/apiserver_test.go
@@ -323,8 +323,8 @@ func Test202StatusCode(t *testing.T) {
 	s, clientSet, closeFn := setup(t)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("status-code", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("status-code", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	rsClient := clientSet.AppsV1().ReplicaSets(ns.Name)
 
@@ -380,11 +380,11 @@ func TestListOptions(t *testing.T) {
 			defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIListChunking, true)()
 			etcdOptions := framework.DefaultEtcdOptions()
 			etcdOptions.EnableWatchCache = watchCacheEnabled
-			s, clientSet, closeFn := setupWithOptions(t, &framework.ControlPlaneConfigOptions{EtcdOptions: etcdOptions})
+			_, clientSet, closeFn := setupWithOptions(t, &framework.ControlPlaneConfigOptions{EtcdOptions: etcdOptions})
 			defer closeFn()
 
-			ns := framework.CreateTestingNamespace("list-options", s, t)
-			defer framework.DeleteTestingNamespace(ns, s, t)
+			ns := framework.CreateTestingNamespace("list-options", t)
+			defer framework.DeleteTestingNamespace(ns, t)
 
 			rsClient := clientSet.AppsV1().ReplicaSets(ns.Name)
 
@@ -612,11 +612,11 @@ func TestListResourceVersion0(t *testing.T) {
 			defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIListChunking, true)()
 			etcdOptions := framework.DefaultEtcdOptions()
 			etcdOptions.EnableWatchCache = tc.watchCacheEnabled
-			s, clientSet, closeFn := setupWithOptions(t, &framework.ControlPlaneConfigOptions{EtcdOptions: etcdOptions})
+			_, clientSet, closeFn := setupWithOptions(t, &framework.ControlPlaneConfigOptions{EtcdOptions: etcdOptions})
 			defer closeFn()
 
-			ns := framework.CreateTestingNamespace("list-paging", s, t)
-			defer framework.DeleteTestingNamespace(ns, s, t)
+			ns := framework.CreateTestingNamespace("list-paging", t)
+			defer framework.DeleteTestingNamespace(ns, t)
 
 			rsClient := clientSet.AppsV1().ReplicaSets(ns.Name)
 
@@ -665,11 +665,11 @@ func TestListResourceVersion0(t *testing.T) {
 
 func TestAPIListChunking(t *testing.T) {
 	defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.APIListChunking, true)()
-	s, clientSet, closeFn := setup(t)
+	_, clientSet, closeFn := setup(t)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("list-paging", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("list-paging", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	rsClient := clientSet.AppsV1().ReplicaSets(ns.Name)
 
@@ -743,13 +743,13 @@ func makeSecret(name string) *v1.Secret {
 }
 
 func TestNameInFieldSelector(t *testing.T) {
-	s, clientSet, closeFn := setup(t)
+	_, clientSet, closeFn := setup(t)
 	defer closeFn()
 
 	numNamespaces := 3
 	for i := 0; i < 3; i++ {
-		ns := framework.CreateTestingNamespace(fmt.Sprintf("ns%d", i), s, t)
-		defer framework.DeleteTestingNamespace(ns, s, t)
+		ns := framework.CreateTestingNamespace(fmt.Sprintf("ns%d", i), t)
+		defer framework.DeleteTestingNamespace(ns, t)
 
 		_, err := clientSet.CoreV1().Secrets(ns.Name).Create(context.TODO(), makeSecret("foo"), metav1.CreateOptions{})
 		if err != nil {
diff --git a/test/integration/apiserver/cve_2021_29923_test.go b/test/integration/apiserver/cve_2021_29923_test.go
index 4258ccde5ee..89bdd0aad43 100644
--- a/test/integration/apiserver/cve_2021_29923_test.go
+++ b/test/integration/apiserver/cve_2021_29923_test.go
@@ -48,8 +48,8 @@ func TestCanaryCVE_2021_29923(t *testing.T) {
 		t.Fatalf("unexpected error creating dynamic client: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-cve-2021-29923", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-cve-2021-29923", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	objects := map[schema.GroupVersionResource]string{
 		// k8s.io/kubernetes/pkg/api/v1
diff --git a/test/integration/apiserver/patch_test.go b/test/integration/apiserver/patch_test.go
index a12fcbb2823..e619f6ce5de 100644
--- a/test/integration/apiserver/patch_test.go
+++ b/test/integration/apiserver/patch_test.go
@@ -35,11 +35,11 @@ import (
 
 // Tests that the apiserver retries patches
 func TestPatchConflicts(t *testing.T) {
-	s, clientSet, closeFn := setup(t)
+	_, clientSet, closeFn := setup(t)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("status-code", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("status-code", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	numOfConcurrentPatches := 100
 
diff --git a/test/integration/apiserver/print_test.go b/test/integration/apiserver/print_test.go
index e1bcc7b4afd..0babb85d8ff 100644
--- a/test/integration/apiserver/print_test.go
+++ b/test/integration/apiserver/print_test.go
@@ -142,8 +142,8 @@ func TestServerSidePrint(t *testing.T) {
 	)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("server-print", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("server-print", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	tableParam := fmt.Sprintf("application/json;as=Table;g=%s;v=%s, application/json", metav1beta1.GroupName, metav1beta1.SchemeGroupVersion.Version)
 	printer := newFakePrinter(printersinternal.AddHandlers)
diff --git a/test/integration/auth/auth_test.go b/test/integration/auth/auth_test.go
index 47bf31711d8..a043559c979 100644
--- a/test/integration/auth/auth_test.go
+++ b/test/integration/auth/auth_test.go
@@ -466,8 +466,8 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("auth-always-allow", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("auth-always-allow", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	transport := http.DefaultTransport
 	previousResourceVersion := make(map[string]float64)
@@ -563,8 +563,8 @@ func TestAuthModeAlwaysDeny(t *testing.T) {
 	controlPlaneConfig.GenericConfig.Authorization.Authorizer = authorizerfactory.NewAlwaysDenyAuthorizer()
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("auth-always-deny", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("auth-always-deny", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	transport := resttransport.NewBearerAuthRoundTripper(framework.UnprivilegedUserToken, http.DefaultTransport)
 
 	for _, r := range getTestRequests(ns.Name) {
@@ -612,8 +612,8 @@ func TestAliceNotForbiddenOrUnauthorized(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("auth-alice-not-forbidden", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("auth-alice-not-forbidden", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	previousResourceVersion := make(map[string]float64)
 	transport := http.DefaultTransport
@@ -681,8 +681,8 @@ func TestBobIsForbidden(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("auth-bob-forbidden", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("auth-bob-forbidden", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	transport := http.DefaultTransport
 
@@ -725,8 +725,8 @@ func TestUnknownUserIsUnauthorized(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("auth-unknown-unauthorized", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("auth-unknown-unauthorized", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	transport := http.DefaultTransport
 
@@ -787,8 +787,8 @@ func TestImpersonateIsForbidden(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("auth-impersonate-forbidden", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("auth-impersonate-forbidden", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	transport := http.DefaultTransport
 
@@ -1092,8 +1092,8 @@ func TestAuthorizationAttributeDetermination(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("auth-attribute-determination", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("auth-attribute-determination", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	transport := http.DefaultTransport
 
@@ -1158,8 +1158,8 @@ func TestNamespaceAuthorization(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("auth-namespace", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("auth-namespace", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	previousResourceVersion := make(map[string]float64)
 	transport := http.DefaultTransport
@@ -1256,8 +1256,8 @@ func TestKindAuthorization(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("auth-kind", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("auth-kind", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	previousResourceVersion := make(map[string]float64)
 	transport := http.DefaultTransport
@@ -1340,8 +1340,8 @@ func TestReadOnlyAuthorization(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("auth-read-only", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("auth-read-only", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	transport := http.DefaultTransport
 
@@ -1417,8 +1417,8 @@ func testWebhookTokenAuthenticator(customDialer bool, t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("auth-webhook-token", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("auth-webhook-token", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	transport := http.DefaultTransport
 
diff --git a/test/integration/auth/bootstraptoken_test.go b/test/integration/auth/bootstraptoken_test.go
index fba32c618e5..97d2d764392 100644
--- a/test/integration/auth/bootstraptoken_test.go
+++ b/test/integration/auth/bootstraptoken_test.go
@@ -123,8 +123,8 @@ func TestBootstrapTokenAuth(t *testing.T) {
 			_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 			defer closeFn()
 
-			ns := framework.CreateTestingNamespace("auth-bootstrap-token", s, t)
-			defer framework.DeleteTestingNamespace(ns, s, t)
+			ns := framework.CreateTestingNamespace("auth-bootstrap-token", t)
+			defer framework.DeleteTestingNamespace(ns, t)
 
 			previousResourceVersion := make(map[string]float64)
 			transport := http.DefaultTransport
diff --git a/test/integration/configmap/configmap_test.go b/test/integration/configmap/configmap_test.go
index 3052473136b..62ebc811a0e 100644
--- a/test/integration/configmap/configmap_test.go
+++ b/test/integration/configmap/configmap_test.go
@@ -38,8 +38,8 @@ func TestConfigMap(t *testing.T) {
 
 	client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
 
-	ns := framework.CreateTestingNamespace("config-map", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("config-map", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	DoTestConfigMap(t, client, ns)
 }
diff --git a/test/integration/cronjob/cronjob_test.go b/test/integration/cronjob/cronjob_test.go
index f793ba5fefb..fb7bc3fe17c 100644
--- a/test/integration/cronjob/cronjob_test.go
+++ b/test/integration/cronjob/cronjob_test.go
@@ -19,7 +19,6 @@ package cronjob
 import (
 	"context"
 	"fmt"
-	"net/http/httptest"
 	"testing"
 	"time"
 
@@ -36,7 +35,7 @@ import (
 	"k8s.io/kubernetes/test/integration/framework"
 )
 
-func setup(t *testing.T) (*httptest.Server, framework.CloseFunc, *cronjob.ControllerV2, *job.Controller, informers.SharedInformerFactory, clientset.Interface, restclient.Config) {
+func setup(t *testing.T) (framework.CloseFunc, *cronjob.ControllerV2, *job.Controller, informers.SharedInformerFactory, clientset.Interface, restclient.Config) {
 	controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig()
 	_, server, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 
@@ -53,7 +52,7 @@ func setup(t *testing.T) (*httptest.Server, framework.CloseFunc, *cronjob.Contro
 	}
 	jc := job.NewController(informerSet.Core().V1().Pods(), informerSet.Batch().V1().Jobs(), clientSet)
 
-	return server, closeFn, cjc, jc, informerSet, clientSet, config
+	return closeFn, cjc, jc, informerSet, clientSet, config
 }
 
 func newCronJob(name, namespace, schedule string) *batchv1.CronJob {
@@ -144,14 +143,14 @@ func validateJobAndPod(t *testing.T, clientSet clientset.Interface, namespace st
 }
 
 func TestCronJobLaunchesPodAndCleansUp(t *testing.T) {
-	server, closeFn, cjc, jc, informerSet, clientSet, _ := setup(t)
+	closeFn, cjc, jc, informerSet, clientSet, _ := setup(t)
 	defer closeFn()
 
 	cronJobName := "foo"
 	namespaceName := "simple-cronjob-test"
 
-	ns := framework.CreateTestingNamespace(namespaceName, server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace(namespaceName, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	cjClient := clientSet.BatchV1().CronJobs(ns.Name)
 
diff --git a/test/integration/daemonset/daemonset_test.go b/test/integration/daemonset/daemonset_test.go
index f3d9b00ff25..6fd08495917 100644
--- a/test/integration/daemonset/daemonset_test.go
+++ b/test/integration/daemonset/daemonset_test.go
@@ -19,7 +19,6 @@ package daemonset
 import (
 	"context"
 	"fmt"
-	"net/http/httptest"
 	"testing"
 	"time"
 
@@ -51,7 +50,7 @@ import (
 
 var zero = int64(0)
 
-func setup(t *testing.T) (*httptest.Server, framework.CloseFunc, *daemon.DaemonSetsController, informers.SharedInformerFactory, clientset.Interface) {
+func setup(t *testing.T) (framework.CloseFunc, *daemon.DaemonSetsController, informers.SharedInformerFactory, clientset.Interface) {
 	controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig()
 	_, server, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 
@@ -74,7 +73,7 @@ func setup(t *testing.T) (*httptest.Server, framework.CloseFunc, *daemon.DaemonS
 		t.Fatalf("error creating DaemonSets controller: %v", err)
 	}
 
-	return server, closeFn, dc, informers, clientSet
+	return closeFn, dc, informers, clientSet
 }
 
 func setupScheduler(
@@ -421,10 +420,10 @@ func forEachStrategy(t *testing.T, tf func(t *testing.T, strategy *apps.DaemonSe
 
 func TestOneNodeDaemonLaunchesPod(t *testing.T) {
 	forEachStrategy(t, func(t *testing.T, strategy *apps.DaemonSetUpdateStrategy) {
-		server, closeFn, dc, informers, clientset := setup(t)
+		closeFn, dc, informers, clientset := setup(t)
 		defer closeFn()
-		ns := framework.CreateTestingNamespace("one-node-daemonset-test", server, t)
-		defer framework.DeleteTestingNamespace(ns, server, t)
+		ns := framework.CreateTestingNamespace("one-node-daemonset-test", t)
+		defer framework.DeleteTestingNamespace(ns, t)
 
 		dsClient := clientset.AppsV1().DaemonSets(ns.Name)
 		podClient := clientset.CoreV1().Pods(ns.Name)
@@ -460,10 +459,10 @@ func TestOneNodeDaemonLaunchesPod(t *testing.T) {
 
 func TestSimpleDaemonSetLaunchesPods(t *testing.T) {
 	forEachStrategy(t, func(t *testing.T, strategy *apps.DaemonSetUpdateStrategy) {
-		server, closeFn, dc, informers, clientset := setup(t)
+		closeFn, dc, informers, clientset := setup(t)
 		defer closeFn()
-		ns := framework.CreateTestingNamespace("simple-daemonset-test", server, t)
-		defer framework.DeleteTestingNamespace(ns, server, t)
+		ns := framework.CreateTestingNamespace("simple-daemonset-test", t)
+		defer framework.DeleteTestingNamespace(ns, t)
 
 		dsClient := clientset.AppsV1().DaemonSets(ns.Name)
 		podClient := clientset.CoreV1().Pods(ns.Name)
@@ -496,10 +495,10 @@ func TestSimpleDaemonSetLaunchesPods(t *testing.T) {
 
 func TestDaemonSetWithNodeSelectorLaunchesPods(t *testing.T) {
 	forEachStrategy(t, func(t *testing.T, strategy *apps.DaemonSetUpdateStrategy) {
-		server, closeFn, dc, informers, clientset := setup(t)
+		closeFn, dc, informers, clientset := setup(t)
 		defer closeFn()
-		ns := framework.CreateTestingNamespace("simple-daemonset-test", server, t)
-		defer framework.DeleteTestingNamespace(ns, server, t)
+		ns := framework.CreateTestingNamespace("simple-daemonset-test", t)
+		defer framework.DeleteTestingNamespace(ns, t)
 
 		dsClient := clientset.AppsV1().DaemonSets(ns.Name)
 		podClient := clientset.CoreV1().Pods(ns.Name)
@@ -565,10 +564,10 @@ func TestDaemonSetWithNodeSelectorLaunchesPods(t *testing.T) {
 
 func TestNotReadyNodeDaemonDoesLaunchPod(t *testing.T) {
 	forEachStrategy(t, func(t *testing.T, strategy *apps.DaemonSetUpdateStrategy) {
-		server, closeFn, dc, informers, clientset := setup(t)
+		closeFn, dc, informers, clientset := setup(t)
 		defer closeFn()
-		ns := framework.CreateTestingNamespace("simple-daemonset-test", server, t)
-		defer framework.DeleteTestingNamespace(ns, server, t)
+		ns := framework.CreateTestingNamespace("simple-daemonset-test", t)
+		defer framework.DeleteTestingNamespace(ns, t)
 
 		dsClient := clientset.AppsV1().DaemonSets(ns.Name)
 		podClient := clientset.CoreV1().Pods(ns.Name)
@@ -612,10 +611,10 @@ func TestNotReadyNodeDaemonDoesLaunchPod(t *testing.T) {
 // not schedule Pods onto the nodes with insufficient resource.
 func TestInsufficientCapacityNode(t *testing.T) {
 	forEachStrategy(t, func(t *testing.T, strategy *apps.DaemonSetUpdateStrategy) {
-		server, closeFn, dc, informers, clientset := setup(t)
+		closeFn, dc, informers, clientset := setup(t)
 		defer closeFn()
-		ns := framework.CreateTestingNamespace("insufficient-capacity", server, t)
-		defer framework.DeleteTestingNamespace(ns, server, t)
+		ns := framework.CreateTestingNamespace("insufficient-capacity", t)
+		defer framework.DeleteTestingNamespace(ns, t)
 
 		dsClient := clientset.AppsV1().DaemonSets(ns.Name)
 		podClient := clientset.CoreV1().Pods(ns.Name)
@@ -676,10 +675,10 @@ func TestInsufficientCapacityNode(t *testing.T) {
 // TestLaunchWithHashCollision tests that a DaemonSet can be updated even if there is a
 // hash collision with an existing ControllerRevision
 func TestLaunchWithHashCollision(t *testing.T) {
-	server, closeFn, dc, informers, clientset := setup(t)
+	closeFn, dc, informers, clientset := setup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("one-node-daemonset-test", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("one-node-daemonset-test", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	dsClient := clientset.AppsV1().DaemonSets(ns.Name)
 	podInformer := informers.Core().V1().Pods().Informer()
@@ -787,10 +786,10 @@ func TestLaunchWithHashCollision(t *testing.T) {
 // 2. Add a node to ensure the controller sync
 // 3. The dsc is expected to "PATCH" the existing pod label with new hash and deletes the old controllerrevision once finishes the update
 func TestDSCUpdatesPodLabelAfterDedupCurHistories(t *testing.T) {
-	server, closeFn, dc, informers, clientset := setup(t)
+	closeFn, dc, informers, clientset := setup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("one-node-daemonset-test", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("one-node-daemonset-test", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	dsClient := clientset.AppsV1().DaemonSets(ns.Name)
 	podInformer := informers.Core().V1().Pods().Informer()
@@ -915,10 +914,10 @@ func TestDSCUpdatesPodLabelAfterDedupCurHistories(t *testing.T) {
 // TestTaintedNode tests tainted node isn't expected to have pod scheduled
 func TestTaintedNode(t *testing.T) {
 	forEachStrategy(t, func(t *testing.T, strategy *apps.DaemonSetUpdateStrategy) {
-		server, closeFn, dc, informers, clientset := setup(t)
+		closeFn, dc, informers, clientset := setup(t)
 		defer closeFn()
-		ns := framework.CreateTestingNamespace("tainted-node", server, t)
-		defer framework.DeleteTestingNamespace(ns, server, t)
+		ns := framework.CreateTestingNamespace("tainted-node", t)
+		defer framework.DeleteTestingNamespace(ns, t)
 
 		dsClient := clientset.AppsV1().DaemonSets(ns.Name)
 		podClient := clientset.CoreV1().Pods(ns.Name)
@@ -980,10 +979,10 @@ func TestTaintedNode(t *testing.T) {
 // to the Unschedulable nodes.
 func TestUnschedulableNodeDaemonDoesLaunchPod(t *testing.T) {
 	forEachStrategy(t, func(t *testing.T, strategy *apps.DaemonSetUpdateStrategy) {
-		server, closeFn, dc, informers, clientset := setup(t)
+		closeFn, dc, informers, clientset := setup(t)
 		defer closeFn()
-		ns := framework.CreateTestingNamespace("daemonset-unschedulable-test", server, t)
-		defer framework.DeleteTestingNamespace(ns, server, t)
+		ns := framework.CreateTestingNamespace("daemonset-unschedulable-test", t)
+		defer framework.DeleteTestingNamespace(ns, t)
 
 		dsClient := clientset.AppsV1().DaemonSets(ns.Name)
 		podClient := clientset.CoreV1().Pods(ns.Name)
diff --git a/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go b/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go
index 538eaf0d83b..84c1124fee5 100644
--- a/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go
+++ b/test/integration/defaulttolerationseconds/defaulttolerationseconds_test.go
@@ -39,8 +39,8 @@ func TestAdmission(t *testing.T) {
 
 	client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
 
-	ns := framework.CreateTestingNamespace("default-toleration-seconds", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("default-toleration-seconds", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	pod := v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
diff --git a/test/integration/deployment/deployment_test.go b/test/integration/deployment/deployment_test.go
index 7430623aed9..c2c28d55d8d 100644
--- a/test/integration/deployment/deployment_test.go
+++ b/test/integration/deployment/deployment_test.go
@@ -36,11 +36,11 @@ import (
 )
 
 func TestNewDeployment(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-new-deployment"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	replicas := int32(20)
 	tester := &deploymentTester{t: t, c: c, deployment: newDeployment(name, ns.Name, replicas)}
@@ -111,11 +111,11 @@ func TestNewDeployment(t *testing.T) {
 // TODO: drop the rollback portions of this test when extensions/v1beta1 is no longer served
 // and rollback endpoint is no longer supported.
 func TestDeploymentRollingUpdate(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-rolling-update-deployment"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	// Start informer and controllers
 	stopControllers := runControllersAndInformers(t, rm, dc, informers)
@@ -205,11 +205,11 @@ func TestDeploymentRollingUpdate(t *testing.T) {
 
 // selectors are IMMUTABLE for all API versions except apps/v1beta1 and extensions/v1beta1
 func TestDeploymentSelectorImmutability(t *testing.T) {
-	s, closeFn, c := dcSimpleSetup(t)
+	closeFn, c := dcSimpleSetup(t)
 	defer closeFn()
 	name := "test-deployment-selector-immutability"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	tester := &deploymentTester{t: t, c: c, deployment: newDeployment(name, ns.Name, int32(20))}
 	var err error
@@ -239,11 +239,11 @@ func TestDeploymentSelectorImmutability(t *testing.T) {
 
 // Paused deployment should not start new rollout
 func TestPausedDeployment(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-paused-deployment"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	replicas := int32(1)
 	tester := &deploymentTester{t: t, c: c, deployment: newDeployment(name, ns.Name, replicas)}
@@ -338,11 +338,11 @@ func TestPausedDeployment(t *testing.T) {
 
 // Paused deployment can be scaled
 func TestScalePausedDeployment(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-scale-paused-deployment"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	replicas := int32(1)
 	tester := &deploymentTester{t: t, c: c, deployment: newDeployment(name, ns.Name, replicas)}
@@ -418,11 +418,11 @@ func TestScalePausedDeployment(t *testing.T) {
 
 // Deployment rollout shouldn't be blocked on hash collisions
 func TestDeploymentHashCollision(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-hash-collision-deployment"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	replicas := int32(1)
 	tester := &deploymentTester{t: t, c: c, deployment: newDeployment(name, ns.Name, replicas)}
@@ -516,11 +516,11 @@ func checkPodsHashLabel(pods *v1.PodList) (string, error) {
 
 // Deployment should have a timeout condition when it fails to progress after given deadline.
 func TestFailedDeployment(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-failed-deployment"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	deploymentName := "progress-check"
 	replicas := int32(1)
@@ -559,11 +559,11 @@ func TestFailedDeployment(t *testing.T) {
 }
 
 func TestOverlappingDeployments(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-overlapping-deployments"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	replicas := int32(1)
 	firstDeploymentName := "first-deployment"
@@ -639,11 +639,11 @@ func TestOverlappingDeployments(t *testing.T) {
 
 // Deployment should not block rollout when updating spec replica number and template at the same time.
 func TestScaledRolloutDeployment(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-scaled-rollout-deployment"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	// Start informer and controllers
 	stopControllers := runControllersAndInformers(t, rm, dc, informers)
@@ -828,11 +828,11 @@ func TestScaledRolloutDeployment(t *testing.T) {
 }
 
 func TestSpecReplicasChange(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-spec-replicas-change"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	deploymentName := "deployment"
 	replicas := int32(1)
@@ -881,11 +881,11 @@ func TestSpecReplicasChange(t *testing.T) {
 }
 
 func TestDeploymentAvailableCondition(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-deployment-available-condition"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	deploymentName := "deployment"
 	replicas := int32(10)
@@ -999,11 +999,11 @@ func testRSControllerRefPatch(t *testing.T, tester *deploymentTester, rs *apps.R
 }
 
 func TestGeneralReplicaSetAdoption(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-general-replicaset-adoption"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	deploymentName := "deployment"
 	replicas := int32(1)
@@ -1088,11 +1088,11 @@ func testScalingUsingScaleSubresource(t *testing.T, tester *deploymentTester, re
 }
 
 func TestDeploymentScaleSubresource(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-deployment-scale-subresource"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	deploymentName := "deployment"
 	replicas := int32(2)
@@ -1129,11 +1129,11 @@ func TestDeploymentScaleSubresource(t *testing.T) {
 // is orphaned, even without PodTemplateSpec change. Refer comment below for more info:
 // https://github.com/kubernetes/kubernetes/pull/59212#discussion_r166465113
 func TestReplicaSetOrphaningAndAdoptionWhenLabelsChange(t *testing.T) {
-	s, closeFn, rm, dc, informers, c := dcSetup(t)
+	closeFn, rm, dc, informers, c := dcSetup(t)
 	defer closeFn()
 	name := "test-replicaset-orphaning-and-adoption-when-labels-change"
-	ns := framework.CreateTestingNamespace(name, s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace(name, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	deploymentName := "deployment"
 	replicas := int32(1)
diff --git a/test/integration/deployment/util.go b/test/integration/deployment/util.go
index a49af3e1780..1baf7bd6d8d 100644
--- a/test/integration/deployment/util.go
+++ b/test/integration/deployment/util.go
@@ -19,7 +19,6 @@ package deployment
 import (
 	"context"
 	"fmt"
-	"net/http/httptest"
 	"sync"
 	"testing"
 	"time"
@@ -102,7 +101,7 @@ func newDeployment(name, ns string, replicas int32) *apps.Deployment {
 }
 
 // dcSetup sets up necessities for Deployment integration test, including control plane, apiserver, informers, and clientset
-func dcSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *replicaset.ReplicaSetController, *deployment.DeploymentController, informers.SharedInformerFactory, clientset.Interface) {
+func dcSetup(t *testing.T) (framework.CloseFunc, *replicaset.ReplicaSetController, *deployment.DeploymentController, informers.SharedInformerFactory, clientset.Interface) {
 	controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig()
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 
@@ -129,12 +128,12 @@ func dcSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *replicaset.R
 		clientset.NewForConfigOrDie(restclient.AddUserAgent(&config, "replicaset-controller")),
 		replicaset.BurstReplicas,
 	)
-	return s, closeFn, rm, dc, informers, clientSet
+	return closeFn, rm, dc, informers, clientSet
 }
 
 // dcSimpleSetup sets up necessities for Deployment integration test, including control plane, apiserver,
 // and clientset, but not controllers and informers
-func dcSimpleSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, clientset.Interface) {
+func dcSimpleSetup(t *testing.T) (framework.CloseFunc, clientset.Interface) {
 	controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig()
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 
@@ -143,7 +142,7 @@ func dcSimpleSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, clients
 	if err != nil {
 		t.Fatalf("error in create clientset: %v", err)
 	}
-	return s, closeFn, clientSet
+	return closeFn, clientSet
 }
 
 // runControllersAndInformers runs RS and deployment controllers and informers
diff --git a/test/integration/dualstack/dualstack_endpoints_test.go b/test/integration/dualstack/dualstack_endpoints_test.go
index 685d9daf906..970e70fc761 100644
--- a/test/integration/dualstack/dualstack_endpoints_test.go
+++ b/test/integration/dualstack/dualstack_endpoints_test.go
@@ -156,8 +156,8 @@ func TestDualStackEndpoints(t *testing.T) {
 
 	for i, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
-			ns := framework.CreateTestingNamespace(fmt.Sprintf("test-endpointslice-dualstack-%d", i), s, t)
-			defer framework.DeleteTestingNamespace(ns, s, t)
+			ns := framework.CreateTestingNamespace(fmt.Sprintf("test-endpointslice-dualstack-%d", i), t)
+			defer framework.DeleteTestingNamespace(ns, t)
 
 			// Create a pod with labels
 			pod := &v1.Pod{
diff --git a/test/integration/dualstack/dualstack_test.go b/test/integration/dualstack/dualstack_test.go
index 46fd8839ee4..4ec8f72bc84 100644
--- a/test/integration/dualstack/dualstack_test.go
+++ b/test/integration/dualstack/dualstack_test.go
@@ -1597,8 +1597,8 @@ func Test_ServiceChangeTypeHeadlessToExternalNameWithPatch(t *testing.T) {
 		t.Fatalf("Error creating clientset: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-service-allocate-node-ports", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-service-allocate-node-ports", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	service := &v1.Service{
 		ObjectMeta: metav1.ObjectMeta{
diff --git a/test/integration/endpoints/endpoints_test.go b/test/integration/endpoints/endpoints_test.go
index 882f3b9b80f..d5e3c850053 100644
--- a/test/integration/endpoints/endpoints_test.go
+++ b/test/integration/endpoints/endpoints_test.go
@@ -62,8 +62,8 @@ func TestEndpointUpdates(t *testing.T) {
 	go epController.Run(ctx, 1)
 
 	// Create namespace
-	ns := framework.CreateTestingNamespace("test-endpoints-updates", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-endpoints-updates", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	// Create a pod with labels
 	pod := &v1.Pod{
@@ -191,8 +191,8 @@ func TestEndpointWithTerminatingPod(t *testing.T) {
 	go epController.Run(ctx, 1)
 
 	// Create namespace
-	ns := framework.CreateTestingNamespace("test-endpoints-terminating", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-endpoints-terminating", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	// Create a pod with labels
 	pod := &v1.Pod{
diff --git a/test/integration/endpointslice/endpointslicemirroring_test.go b/test/integration/endpointslice/endpointslicemirroring_test.go
index 44f6d7d4af9..6e622d971e1 100644
--- a/test/integration/endpointslice/endpointslicemirroring_test.go
+++ b/test/integration/endpointslice/endpointslicemirroring_test.go
@@ -174,8 +174,8 @@ func TestEndpointSliceMirroring(t *testing.T) {
 
 	for i, tc := range testCases {
 		t.Run(tc.testName, func(t *testing.T) {
-			ns := framework.CreateTestingNamespace(fmt.Sprintf("test-endpointslice-mirroring-%d", i), server, t)
-			defer framework.DeleteTestingNamespace(ns, server, t)
+			ns := framework.CreateTestingNamespace(fmt.Sprintf("test-endpointslice-mirroring-%d", i), t)
+			defer framework.DeleteTestingNamespace(ns, t)
 
 			resourceName := ""
 			if tc.service != nil {
@@ -294,8 +294,8 @@ func TestEndpointSliceMirroringUpdates(t *testing.T) {
 
 	for i, tc := range testCases {
 		t.Run(tc.testName, func(t *testing.T) {
-			ns := framework.CreateTestingNamespace(fmt.Sprintf("test-endpointslice-mirroring-%d", i), server, t)
-			defer framework.DeleteTestingNamespace(ns, server, t)
+			ns := framework.CreateTestingNamespace(fmt.Sprintf("test-endpointslice-mirroring-%d", i), t)
+			defer framework.DeleteTestingNamespace(ns, t)
 
 			service := &corev1.Service{
 				ObjectMeta: metav1.ObjectMeta{
@@ -476,8 +476,8 @@ func TestEndpointSliceMirroringSelectorTransition(t *testing.T) {
 
 	for i, tc := range testCases {
 		t.Run(tc.testName, func(t *testing.T) {
-			ns := framework.CreateTestingNamespace(fmt.Sprintf("test-endpointslice-mirroring-%d", i), server, t)
-			defer framework.DeleteTestingNamespace(ns, server, t)
+			ns := framework.CreateTestingNamespace(fmt.Sprintf("test-endpointslice-mirroring-%d", i), t)
+			defer framework.DeleteTestingNamespace(ns, t)
 			meta := metav1.ObjectMeta{Name: "test-123", Namespace: ns.Name}
 
 			service := &corev1.Service{
diff --git a/test/integration/endpointslice/endpointsliceterminating_test.go b/test/integration/endpointslice/endpointsliceterminating_test.go
index 2cd5be85e81..49bec70f586 100644
--- a/test/integration/endpointslice/endpointsliceterminating_test.go
+++ b/test/integration/endpointslice/endpointsliceterminating_test.go
@@ -181,8 +181,8 @@ func TestEndpointSliceTerminating(t *testing.T) {
 			go epsController.Run(1, stopCh)
 
 			// Create namespace
-			ns := framework.CreateTestingNamespace("test-endpoints-terminating", server, t)
-			defer framework.DeleteTestingNamespace(ns, server, t)
+			ns := framework.CreateTestingNamespace("test-endpoints-terminating", t)
+			defer framework.DeleteTestingNamespace(ns, t)
 
 			node := &corev1.Node{
 				ObjectMeta: metav1.ObjectMeta{
diff --git a/test/integration/evictions/evictions_test.go b/test/integration/evictions/evictions_test.go
index 61a1c81373c..691e174a1f6 100644
--- a/test/integration/evictions/evictions_test.go
+++ b/test/integration/evictions/evictions_test.go
@@ -64,8 +64,8 @@ func TestConcurrentEvictionRequests(t *testing.T) {
 	s, closeFn, rm, informers, _ := rmSetup(t)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("concurrent-eviction-requests", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("concurrent-eviction-requests", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -183,8 +183,8 @@ func TestTerminalPodEviction(t *testing.T) {
 	s, closeFn, rm, informers, _ := rmSetup(t)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("terminalpod-eviction", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("terminalpod-eviction", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
diff --git a/test/integration/framework/util.go b/test/integration/framework/util.go
index 7e5e6b08b79..457a6e8f91f 100644
--- a/test/integration/framework/util.go
+++ b/test/integration/framework/util.go
@@ -21,7 +21,6 @@ package framework
 import (
 	"context"
 	"fmt"
-	"net/http/httptest"
 	"strings"
 	"testing"
 	"time"
@@ -46,7 +45,7 @@ const (
 )
 
 // CreateTestingNamespace creates a namespace for testing.
-func CreateTestingNamespace(baseName string, apiserver *httptest.Server, t *testing.T) *v1.Namespace {
+func CreateTestingNamespace(baseName string, t *testing.T) *v1.Namespace {
 	// TODO: Create a namespace with a given basename.
 	// Currently we neither create the namespace nor delete all of its contents at the end.
 	// But as long as tests are not using the same namespaces, this should work fine.
@@ -61,7 +60,7 @@ func CreateTestingNamespace(baseName string, apiserver *httptest.Server, t *test
 }
 
 // DeleteTestingNamespace is currently a no-op function.
-func DeleteTestingNamespace(ns *v1.Namespace, apiserver *httptest.Server, t *testing.T) {
+func DeleteTestingNamespace(ns *v1.Namespace, t *testing.T) {
 	// TODO: Remove all resources from a given namespace once we implement CreateTestingNamespace.
 	// Note: integration tests are not expected to run against persistent fixtures today, so not
 	// cleaning up data they create has no impact.
diff --git a/test/integration/job/job_test.go b/test/integration/job/job_test.go
index 5aa2d6cb758..0eda5d76b02 100644
--- a/test/integration/job/job_test.go
+++ b/test/integration/job/job_test.go
@@ -1174,9 +1174,9 @@ func setup(t *testing.T, nsBaseName string) (framework.CloseFunc, *restclient.Co
 	if err != nil {
 		t.Fatalf("Error creating clientset: %v", err)
 	}
-	ns := framework.CreateTestingNamespace(nsBaseName, server, t)
+	ns := framework.CreateTestingNamespace(nsBaseName, t)
 	closeFn := func() {
-		framework.DeleteTestingNamespace(ns, server, t)
+		framework.DeleteTestingNamespace(ns, t)
 		apiServerCloseFn()
 	}
 	return closeFn, &config, clientSet, ns
diff --git a/test/integration/pods/pods_test.go b/test/integration/pods/pods_test.go
index bd5cc6e5302..030cdd3f267 100644
--- a/test/integration/pods/pods_test.go
+++ b/test/integration/pods/pods_test.go
@@ -41,8 +41,8 @@ func TestPodUpdateActiveDeadlineSeconds(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("pod-activedeadline-update", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("pod-activedeadline-update", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
 
@@ -159,8 +159,8 @@ func TestPodReadOnlyFilesystem(t *testing.T) {
 	defer closeFn()
 
 	isReadOnly := true
-	ns := framework.CreateTestingNamespace("pod-readonly-root", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("pod-readonly-root", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
 
@@ -194,8 +194,8 @@ func TestPodCreateEphemeralContainers(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("pod-create-ephemeral-containers", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("pod-create-ephemeral-containers", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
 
@@ -264,8 +264,8 @@ func TestPodPatchEphemeralContainers(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("pod-patch-ephemeral-containers", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("pod-patch-ephemeral-containers", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
 
@@ -496,8 +496,8 @@ func TestPodUpdateEphemeralContainers(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("pod-update-ephemeral-containers", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("pod-update-ephemeral-containers", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
 
@@ -689,8 +689,8 @@ func TestPodEphemeralContainersDisabled(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("pod-ephemeral-containers-disabled", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("pod-ephemeral-containers-disabled", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
 
diff --git a/test/integration/quota/quota_test.go b/test/integration/quota/quota_test.go
index 243d8013e6a..a173ab2a98d 100644
--- a/test/integration/quota/quota_test.go
+++ b/test/integration/quota/quota_test.go
@@ -87,10 +87,10 @@ func TestQuota(t *testing.T) {
 	_, _, closeFn := framework.RunAnAPIServerUsingServer(controlPlaneConfig, s, h)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("quotaed", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
-	ns2 := framework.CreateTestingNamespace("non-quotaed", s, t)
-	defer framework.DeleteTestingNamespace(ns2, s, t)
+	ns := framework.CreateTestingNamespace("quotaed", t)
+	defer framework.DeleteTestingNamespace(ns, t)
+	ns2 := framework.CreateTestingNamespace("non-quotaed", t)
+	defer framework.DeleteTestingNamespace(ns2, t)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -320,8 +320,8 @@ func TestQuotaLimitedResourceDenial(t *testing.T) {
 	_, _, closeFn := framework.RunAnAPIServerUsingServer(controlPlaneConfig, s, h)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("quota", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("quota", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -449,8 +449,8 @@ func TestQuotaLimitService(t *testing.T) {
 	_, _, closeFn := framework.RunAnAPIServerUsingServer(controlPlaneConfig, s, h)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("quota", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("quota", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
diff --git a/test/integration/replicaset/replicaset_test.go b/test/integration/replicaset/replicaset_test.go
index e0c7feaedde..665f673bb18 100644
--- a/test/integration/replicaset/replicaset_test.go
+++ b/test/integration/replicaset/replicaset_test.go
@@ -19,7 +19,6 @@ package replicaset
 import (
 	"context"
 	"fmt"
-	"net/http/httptest"
 	"reflect"
 	"strings"
 	"testing"
@@ -117,7 +116,7 @@ func newMatchingPod(podName, namespace string) *v1.Pod {
 	}
 }
 
-func rmSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *replicaset.ReplicaSetController, informers.SharedInformerFactory, clientset.Interface) {
+func rmSetup(t *testing.T) (framework.CloseFunc, *replicaset.ReplicaSetController, informers.SharedInformerFactory, clientset.Interface) {
 	controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig()
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 
@@ -136,10 +135,10 @@ func rmSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *replicaset.R
 		replicaset.BurstReplicas,
 	)
 
-	return s, closeFn, rm, informers, clientSet
+	return closeFn, rm, informers, clientSet
 }
 
-func rmSimpleSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, clientset.Interface) {
+func rmSimpleSetup(t *testing.T) (framework.CloseFunc, clientset.Interface) {
 	controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig()
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 
@@ -148,7 +147,7 @@ func rmSimpleSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, clients
 	if err != nil {
 		t.Fatalf("Error in create clientset: %v", err)
 	}
-	return s, closeFn, clientSet
+	return closeFn, clientSet
 }
 
 // Run RS controller and informers
@@ -423,10 +422,10 @@ func TestAdoption(t *testing.T) {
 	}
 	for i, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			s, closeFn, rm, informers, clientSet := rmSetup(t)
+			closeFn, rm, informers, clientSet := rmSetup(t)
 			defer closeFn()
-			ns := framework.CreateTestingNamespace(fmt.Sprintf("rs-adoption-%d", i), s, t)
-			defer framework.DeleteTestingNamespace(ns, s, t)
+			ns := framework.CreateTestingNamespace(fmt.Sprintf("rs-adoption-%d", i), t)
+			defer framework.DeleteTestingNamespace(ns, t)
 
 			rsClient := clientSet.AppsV1().ReplicaSets(ns.Name)
 			podClient := clientSet.CoreV1().Pods(ns.Name)
@@ -467,10 +466,10 @@ func TestAdoption(t *testing.T) {
 
 // selectors are IMMUTABLE for all API versions except extensions/v1beta1
 func TestRSSelectorImmutability(t *testing.T) {
-	s, closeFn, clientSet := rmSimpleSetup(t)
+	closeFn, clientSet := rmSimpleSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("rs-selector-immutability", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("rs-selector-immutability", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	rs := newRS("rs", ns.Name, 0)
 	createRSsPods(t, clientSet, []*apps.ReplicaSet{rs}, []*v1.Pod{})
 
@@ -494,10 +493,10 @@ func TestRSSelectorImmutability(t *testing.T) {
 }
 
 func TestSpecReplicasChange(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-spec-replicas-change", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-spec-replicas-change", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -536,10 +535,10 @@ func TestSpecReplicasChange(t *testing.T) {
 }
 
 func TestDeletingAndFailedPods(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-deleting-and-failed-pods", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-deleting-and-failed-pods", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -639,10 +638,10 @@ func TestPodDeletionCost(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodDeletionCost, tc.enabled)()
-			s, closeFn, rm, informers, c := rmSetup(t)
+			closeFn, rm, informers, c := rmSetup(t)
 			defer closeFn()
-			ns := framework.CreateTestingNamespace(tc.name, s, t)
-			defer framework.DeleteTestingNamespace(ns, s, t)
+			ns := framework.CreateTestingNamespace(tc.name, t)
+			defer framework.DeleteTestingNamespace(ns, t)
 			stopControllers := runControllerAndInformers(t, rm, informers, 0)
 			defer stopControllers()
 
@@ -698,10 +697,10 @@ func TestPodDeletionCost(t *testing.T) {
 }
 
 func TestOverlappingRSs(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-overlapping-rss", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-overlapping-rss", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -733,10 +732,10 @@ func TestOverlappingRSs(t *testing.T) {
 }
 
 func TestPodOrphaningAndAdoptionWhenLabelsChange(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-pod-orphaning-and-adoption-when-labels-change", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-pod-orphaning-and-adoption-when-labels-change", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -810,10 +809,10 @@ func TestPodOrphaningAndAdoptionWhenLabelsChange(t *testing.T) {
 }
 
 func TestGeneralPodAdoption(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-general-pod-adoption", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-general-pod-adoption", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -842,10 +841,10 @@ func TestGeneralPodAdoption(t *testing.T) {
 }
 
 func TestReadyAndAvailableReplicas(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-ready-and-available-replicas", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-ready-and-available-replicas", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -894,10 +893,10 @@ func TestReadyAndAvailableReplicas(t *testing.T) {
 }
 
 func TestRSScaleSubresource(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-rs-scale-subresource", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-rs-scale-subresource", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -913,10 +912,10 @@ func TestRSScaleSubresource(t *testing.T) {
 }
 
 func TestExtraPodsAdoptionAndDeletion(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-extra-pods-adoption-and-deletion", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-extra-pods-adoption-and-deletion", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	rs := newRS("rs", ns.Name, 2)
 	// Create 3 pods, RS should adopt only 2 of them
@@ -945,10 +944,10 @@ func TestExtraPodsAdoptionAndDeletion(t *testing.T) {
 }
 
 func TestFullyLabeledReplicas(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-fully-labeled-replicas", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-fully-labeled-replicas", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -988,10 +987,10 @@ func TestFullyLabeledReplicas(t *testing.T) {
 }
 
 func TestReplicaSetsAppsV1DefaultGCPolicy(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-default-gc-v1", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-default-gc-v1", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
diff --git a/test/integration/replicationcontroller/replicationcontroller_test.go b/test/integration/replicationcontroller/replicationcontroller_test.go
index 1b408de4efa..41162bd3991 100644
--- a/test/integration/replicationcontroller/replicationcontroller_test.go
+++ b/test/integration/replicationcontroller/replicationcontroller_test.go
@@ -19,7 +19,6 @@ package replicationcontroller
 import (
 	"context"
 	"fmt"
-	"net/http/httptest"
 	"reflect"
 	"testing"
 	"time"
@@ -110,7 +109,7 @@ func newMatchingPod(podName, namespace string) *v1.Pod {
 	}
 }
 
-func rmSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *replication.ReplicationManager, informers.SharedInformerFactory, clientset.Interface) {
+func rmSetup(t *testing.T) (framework.CloseFunc, *replication.ReplicationManager, informers.SharedInformerFactory, clientset.Interface) {
 	controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig()
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 
@@ -129,7 +128,7 @@ func rmSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *replication.
 		replication.BurstReplicas,
 	)
 
-	return s, closeFn, rm, informers, clientSet
+	return closeFn, rm, informers, clientSet
 }
 
 // Run RC controller and informers
@@ -411,10 +410,10 @@ func TestAdoption(t *testing.T) {
 	}
 	for i, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			s, closeFn, rm, informers, clientSet := rmSetup(t)
+			closeFn, rm, informers, clientSet := rmSetup(t)
 			defer closeFn()
-			ns := framework.CreateTestingNamespace(fmt.Sprintf("rc-adoption-%d", i), s, t)
-			defer framework.DeleteTestingNamespace(ns, s, t)
+			ns := framework.CreateTestingNamespace(fmt.Sprintf("rc-adoption-%d", i), t)
+			defer framework.DeleteTestingNamespace(ns, t)
 
 			rcClient := clientSet.CoreV1().ReplicationControllers(ns.Name)
 			podClient := clientSet.CoreV1().Pods(ns.Name)
@@ -454,10 +453,10 @@ func TestAdoption(t *testing.T) {
 }
 
 func TestSpecReplicasChange(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-spec-replicas-change", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-spec-replicas-change", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -497,10 +496,10 @@ func TestSpecReplicasChange(t *testing.T) {
 
 func TestLogarithmicScaleDown(t *testing.T) {
 	defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.LogarithmicScaleDown, true)()
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-spec-replicas-change", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-spec-replicas-change", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -534,10 +533,10 @@ func TestLogarithmicScaleDown(t *testing.T) {
 }
 
 func TestDeletingAndFailedPods(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-deleting-and-failed-pods", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-deleting-and-failed-pods", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -599,10 +598,10 @@ func TestDeletingAndFailedPods(t *testing.T) {
 }
 
 func TestOverlappingRCs(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-overlapping-rcs", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-overlapping-rcs", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -634,10 +633,10 @@ func TestOverlappingRCs(t *testing.T) {
 }
 
 func TestPodOrphaningAndAdoptionWhenLabelsChange(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-pod-orphaning-and-adoption-when-labels-change", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-pod-orphaning-and-adoption-when-labels-change", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -711,10 +710,10 @@ func TestPodOrphaningAndAdoptionWhenLabelsChange(t *testing.T) {
 }
 
 func TestGeneralPodAdoption(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-general-pod-adoption", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-general-pod-adoption", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -743,10 +742,10 @@ func TestGeneralPodAdoption(t *testing.T) {
 }
 
 func TestReadyAndAvailableReplicas(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-ready-and-available-replicas", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-ready-and-available-replicas", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -795,10 +794,10 @@ func TestReadyAndAvailableReplicas(t *testing.T) {
 }
 
 func TestRCScaleSubresource(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-rc-scale-subresource", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-rc-scale-subresource", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
@@ -814,10 +813,10 @@ func TestRCScaleSubresource(t *testing.T) {
 }
 
 func TestExtraPodsAdoptionAndDeletion(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-extra-pods-adoption-and-deletion", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-extra-pods-adoption-and-deletion", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	rc := newRC("rc", ns.Name, 2)
 	// Create 3 pods, RC should adopt only 2 of them
@@ -846,10 +845,10 @@ func TestExtraPodsAdoptionAndDeletion(t *testing.T) {
 }
 
 func TestFullyLabeledReplicas(t *testing.T) {
-	s, closeFn, rm, informers, c := rmSetup(t)
+	closeFn, rm, informers, c := rmSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-fully-labeled-replicas", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-fully-labeled-replicas", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	stopControllers := runControllerAndInformers(t, rm, informers, 0)
 	defer stopControllers()
 
diff --git a/test/integration/secrets/secrets_test.go b/test/integration/secrets/secrets_test.go
index 627ec9e38c5..af4bcd669b7 100644
--- a/test/integration/secrets/secrets_test.go
+++ b/test/integration/secrets/secrets_test.go
@@ -44,8 +44,8 @@ func TestSecrets(t *testing.T) {
 
 	client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
 
-	ns := framework.CreateTestingNamespace("secret", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("secret", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	DoTestSecrets(t, client, ns)
 }
diff --git a/test/integration/service/loadbalancer_test.go b/test/integration/service/loadbalancer_test.go
index a07a316f30f..a234dcfa442 100644
--- a/test/integration/service/loadbalancer_test.go
+++ b/test/integration/service/loadbalancer_test.go
@@ -47,8 +47,8 @@ func Test_ServiceLoadBalancerDisableAllocateNodePorts(t *testing.T) {
 		t.Fatalf("Error creating clientset: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-service-allocate-node-ports", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-service-allocate-node-ports", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
@@ -90,8 +90,8 @@ func Test_ServiceUpdateLoadBalancerDisableAllocateNodePorts(t *testing.T) {
 		t.Fatalf("Error creating clientset: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-service-allocate-node-ports", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-service-allocate-node-ports", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
@@ -143,8 +143,8 @@ func Test_ServiceLoadBalancerEnableThenDisableAllocatedNodePorts(t *testing.T) {
 		t.Fatalf("Error creating clientset: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-service-deallocate-node-ports", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-service-deallocate-node-ports", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
@@ -196,8 +196,8 @@ func Test_ServiceLoadBalancerDisableThenEnableAllocatedNodePorts(t *testing.T) {
 		t.Fatalf("Error creating clientset: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-service-reallocate-node-ports", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-service-reallocate-node-ports", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
@@ -259,8 +259,8 @@ func Test_ServiceLoadBalancerEnableLoadBalancerClass(t *testing.T) {
 		t.Fatalf("Error creating clientset: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-service-load-balancer-class", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-service-load-balancer-class", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	controller, cloud, informer := newServiceController(t, client)
 
@@ -308,8 +308,8 @@ func Test_SetLoadBalancerClassThenUpdateLoadBalancerClass(t *testing.T) {
 		t.Fatalf("Error creating clientset: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-service-immutable-load-balancer-class", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-service-immutable-load-balancer-class", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	controller, cloud, informer := newServiceController(t, client)
 
@@ -362,8 +362,8 @@ func Test_UpdateLoadBalancerWithLoadBalancerClass(t *testing.T) {
 		t.Fatalf("Error creating clientset: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-service-update-load-balancer-class", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-service-update-load-balancer-class", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	controller, cloud, informer := newServiceController(t, client)
 
diff --git a/test/integration/service/service_test.go b/test/integration/service/service_test.go
index fe6fe2a3d11..8085c29ee3a 100644
--- a/test/integration/service/service_test.go
+++ b/test/integration/service/service_test.go
@@ -42,8 +42,8 @@ func Test_ExternalNameServiceStopsDefaultingInternalTrafficPolicy(t *testing.T)
 		t.Fatalf("Error creating clientset: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-external-name-drops-internal-traffic-policy", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-external-name-drops-internal-traffic-policy", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
@@ -88,8 +88,8 @@ func Test_ExternalNameServiceDropsInternalTrafficPolicy(t *testing.T) {
 		t.Fatalf("Error creating clientset: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-external-name-drops-internal-traffic-policy", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-external-name-drops-internal-traffic-policy", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	internalTrafficPolicy := corev1.ServiceInternalTrafficPolicyCluster
 	service := &corev1.Service{
@@ -137,8 +137,8 @@ func Test_ConvertingToExternalNameServiceDropsInternalTrafficPolicy(t *testing.T
 		t.Fatalf("Error creating clientset: %v", err)
 	}
 
-	ns := framework.CreateTestingNamespace("test-external-name-drops-internal-traffic-policy", server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace("test-external-name-drops-internal-traffic-policy", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	service := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
diff --git a/test/integration/statefulset/statefulset_test.go b/test/integration/statefulset/statefulset_test.go
index 600395dbcb2..675fb32760b 100644
--- a/test/integration/statefulset/statefulset_test.go
+++ b/test/integration/statefulset/statefulset_test.go
@@ -123,10 +123,10 @@ func TestVolumeTemplateNoopUpdate(t *testing.T) {
 }
 
 func TestSpecReplicasChange(t *testing.T) {
-	s, closeFn, rm, informers, c := scSetup(t)
+	closeFn, rm, informers, c := scSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-spec-replicas-change", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-spec-replicas-change", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	cancel := runControllerAndInformers(rm, informers)
 	defer cancel()
 
@@ -166,10 +166,10 @@ func TestSpecReplicasChange(t *testing.T) {
 }
 
 func TestDeletingAndFailedPods(t *testing.T) {
-	s, closeFn, rm, informers, c := scSetup(t)
+	closeFn, rm, informers, c := scSetup(t)
 	defer closeFn()
-	ns := framework.CreateTestingNamespace("test-deleting-and-failed-pods", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-deleting-and-failed-pods", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 	cancel := runControllerAndInformers(rm, informers)
 	defer cancel()
 
@@ -267,10 +267,10 @@ func TestStatefulSetAvailable(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.StatefulSetMinReadySeconds, test.enabled)()
-			s, closeFn, rm, informers, c := scSetup(t)
+			closeFn, rm, informers, c := scSetup(t)
 			defer closeFn()
-			ns := framework.CreateTestingNamespace("test-available-pods", s, t)
-			defer framework.DeleteTestingNamespace(ns, s, t)
+			ns := framework.CreateTestingNamespace("test-available-pods", t)
+			defer framework.DeleteTestingNamespace(ns, t)
 			cancel := runControllerAndInformers(rm, informers)
 			defer cancel()
 
@@ -381,8 +381,8 @@ func TestStatefulSetStatusWithPodFail(t *testing.T) {
 		clientset.NewForConfigOrDie(restclient.AddUserAgent(&config, "statefulset-controller")),
 	)
 
-	ns := framework.CreateTestingNamespace("test-pod-fail", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("test-pod-fail", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
diff --git a/test/integration/statefulset/util.go b/test/integration/statefulset/util.go
index b74d1495359..1f81c289ac4 100644
--- a/test/integration/statefulset/util.go
+++ b/test/integration/statefulset/util.go
@@ -19,7 +19,6 @@ package statefulset
 import (
 	"context"
 	"fmt"
-	"net/http/httptest"
 	"testing"
 	"time"
 
@@ -160,7 +159,7 @@ func newStatefulSetPVC(name string) v1.PersistentVolumeClaim {
 }
 
 // scSetup sets up necessities for Statefulset integration test, including control plane, apiserver, informers, and clientset
-func scSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *statefulset.StatefulSetController, informers.SharedInformerFactory, clientset.Interface) {
+func scSetup(t *testing.T) (framework.CloseFunc, *statefulset.StatefulSetController, informers.SharedInformerFactory, clientset.Interface) {
 	controlPlaneConfig := framework.NewIntegrationTestControlPlaneConfig()
 	_, s, closeFn := framework.RunAnAPIServer(controlPlaneConfig)
 
@@ -180,7 +179,7 @@ func scSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *statefulset.
 		clientset.NewForConfigOrDie(restclient.AddUserAgent(&config, "statefulset-controller")),
 	)
 
-	return s, closeFn, sc, informers, clientSet
+	return closeFn, sc, informers, clientSet
 }
 
 // Run STS controller and informers
diff --git a/test/integration/storageclasses/storage_classes_test.go b/test/integration/storageclasses/storage_classes_test.go
index 9485d9b289d..60e9e2cf712 100644
--- a/test/integration/storageclasses/storage_classes_test.go
+++ b/test/integration/storageclasses/storage_classes_test.go
@@ -41,8 +41,8 @@ func TestStorageClasses(t *testing.T) {
 
 	client := clientset.NewForConfigOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}}})
 
-	ns := framework.CreateTestingNamespace("storageclass", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("storageclass", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	DoTestStorageClasses(t, client, ns)
 }
diff --git a/test/integration/util/util.go b/test/integration/util/util.go
index 02b4dadce4e..16ca1f30af7 100644
--- a/test/integration/util/util.go
+++ b/test/integration/util/util.go
@@ -214,7 +214,7 @@ func CleanupTest(t *testing.T, testCtx *TestContext) {
 	testCtx.CancelFn()
 	// Cleanup nodes.
 	testCtx.ClientSet.CoreV1().Nodes().DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{})
-	framework.DeleteTestingNamespace(testCtx.NS, testCtx.HTTPServer, t)
+	framework.DeleteTestingNamespace(testCtx.NS, t)
 	testCtx.CloseFn()
 }
 
@@ -351,9 +351,9 @@ func InitTestAPIServer(t *testing.T, nsPrefix string, admission admission.Interf
 	_, testCtx.HTTPServer, testCtx.CloseFn = framework.RunAnAPIServer(controlPlaneConfig)
 
 	if nsPrefix != "default" {
-		testCtx.NS = framework.CreateTestingNamespace(nsPrefix+string(uuid.NewUUID()), testCtx.HTTPServer, t)
+		testCtx.NS = framework.CreateTestingNamespace(nsPrefix+string(uuid.NewUUID()), t)
 	} else {
-		testCtx.NS = framework.CreateTestingNamespace("default", testCtx.HTTPServer, t)
+		testCtx.NS = framework.CreateTestingNamespace("default", t)
 	}
 
 	// 2. Create kubeclient
diff --git a/test/integration/volume/attach_detach_test.go b/test/integration/volume/attach_detach_test.go
index fa949cddaf4..ab319d16791 100644
--- a/test/integration/volume/attach_detach_test.go
+++ b/test/integration/volume/attach_detach_test.go
@@ -156,8 +156,8 @@ func TestPodDeletionWithDswp(t *testing.T) {
 		},
 	}
 
-	ns := framework.CreateTestingNamespace(namespaceName, server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace(namespaceName, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, ctrl, _, informers := createAdClients(ns, t, server, defaultSyncPeriod, defaultTimerConfig)
 	pod := fakePodWithVol(namespaceName)
@@ -231,8 +231,8 @@ func TestPodUpdateWithWithADC(t *testing.T) {
 		},
 	}
 
-	ns := framework.CreateTestingNamespace(namespaceName, server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace(namespaceName, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, ctrl, _, informers := createAdClients(ns, t, server, defaultSyncPeriod, defaultTimerConfig)
 
@@ -301,8 +301,8 @@ func TestPodUpdateWithKeepTerminatedPodVolumes(t *testing.T) {
 		},
 	}
 
-	ns := framework.CreateTestingNamespace(namespaceName, server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace(namespaceName, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, ctrl, _, informers := createAdClients(ns, t, server, defaultSyncPeriod, defaultTimerConfig)
 
@@ -484,8 +484,8 @@ func TestPodAddedByDswp(t *testing.T) {
 		},
 	}
 
-	ns := framework.CreateTestingNamespace(namespaceName, server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace(namespaceName, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, ctrl, _, informers := createAdClients(ns, t, server, defaultSyncPeriod, defaultTimerConfig)
 
@@ -550,8 +550,8 @@ func TestPVCBoundWithADC(t *testing.T) {
 	defer closeFn()
 	namespaceName := "test-pod-deletion"
 
-	ns := framework.CreateTestingNamespace(namespaceName, server, t)
-	defer framework.DeleteTestingNamespace(ns, server, t)
+	ns := framework.CreateTestingNamespace(namespaceName, t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, ctrl, pvCtrl, informers := createAdClients(ns, t, server, defaultSyncPeriod, attachdetach.TimerConfig{
 		ReconcilerLoopPeriod:                        100 * time.Millisecond,
diff --git a/test/integration/volume/persistent_volumes_test.go b/test/integration/volume/persistent_volumes_test.go
index 3accf8c85ab..7bc46735b88 100644
--- a/test/integration/volume/persistent_volumes_test.go
+++ b/test/integration/volume/persistent_volumes_test.go
@@ -108,8 +108,8 @@ func TestPersistentVolumeRecycler(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("pv-recycler", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("pv-recycler", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, ctrl, informers, watchPV, watchPVC := createClients(ns, t, s, defaultSyncPeriod)
 	defer watchPV.Stop()
@@ -163,8 +163,8 @@ func TestPersistentVolumeDeleter(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("pv-deleter", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("pv-deleter", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, ctrl, informers, watchPV, watchPVC := createClients(ns, t, s, defaultSyncPeriod)
 	defer watchPV.Stop()
@@ -223,8 +223,8 @@ func TestPersistentVolumeBindRace(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("pv-bind-race", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("pv-bind-race", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, ctrl, informers, watchPV, watchPVC := createClients(ns, t, s, defaultSyncPeriod)
 	defer watchPV.Stop()
@@ -293,8 +293,8 @@ func TestPersistentVolumeClaimLabelSelector(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("pvc-label-selector", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("pvc-label-selector", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, controller, informers, watchPV, watchPVC := createClients(ns, t, s, defaultSyncPeriod)
 	defer watchPV.Stop()
@@ -374,8 +374,8 @@ func TestPersistentVolumeClaimLabelSelectorMatchExpressions(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("pvc-match-expressions", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("pvc-match-expressions", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, controller, informers, watchPV, watchPVC := createClients(ns, t, s, defaultSyncPeriod)
 	defer watchPV.Stop()
@@ -474,8 +474,8 @@ func TestPersistentVolumeMultiPVs(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("multi-pvs", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("multi-pvs", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, controller, informers, watchPV, watchPVC := createClients(ns, t, s, defaultSyncPeriod)
 	defer watchPV.Stop()
@@ -564,8 +564,8 @@ func TestPersistentVolumeMultiPVsPVCs(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("multi-pvs-pvcs", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("multi-pvs-pvcs", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, binder, informers, watchPV, watchPVC := createClients(ns, t, s, defaultSyncPeriod)
 	defer watchPV.Stop()
@@ -724,8 +724,8 @@ func TestPersistentVolumeControllerStartup(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("controller-startup", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("controller-startup", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	objCount := getObjectCount()
 
@@ -853,8 +853,8 @@ func TestPersistentVolumeProvisionMultiPVCs(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("provision-multi-pvs", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("provision-multi-pvs", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, binder, informers, watchPV, watchPVC := createClients(ns, t, s, defaultSyncPeriod)
 	defer watchPV.Stop()
@@ -948,8 +948,8 @@ func TestPersistentVolumeMultiPVsDiffAccessModes(t *testing.T) {
 	_, s, closeFn := framework.RunAnAPIServer(nil)
 	defer closeFn()
 
-	ns := framework.CreateTestingNamespace("multi-pvs-diff-access", s, t)
-	defer framework.DeleteTestingNamespace(ns, s, t)
+	ns := framework.CreateTestingNamespace("multi-pvs-diff-access", t)
+	defer framework.DeleteTestingNamespace(ns, t)
 
 	testClient, controller, informers, watchPV, watchPVC := createClients(ns, t, s, defaultSyncPeriod)
 	defer watchPV.Stop()
diff --git a/test/integration/volumescheduling/util.go b/test/integration/volumescheduling/util.go
index 18e6c81341f..8b960ce94c9 100644
--- a/test/integration/volumescheduling/util.go
+++ b/test/integration/volumescheduling/util.go
@@ -74,9 +74,9 @@ func initTestAPIServer(t *testing.T, nsPrefix string, admission admission.Interf
 	s := testCtx.httpServer
 
 	if nsPrefix != "default" {
-		testCtx.ns = framework.CreateTestingNamespace(nsPrefix+string(uuid.NewUUID()), s, t)
+		testCtx.ns = framework.CreateTestingNamespace(nsPrefix+string(uuid.NewUUID()), t)
 	} else {
-		testCtx.ns = framework.CreateTestingNamespace("default", s, t)
+		testCtx.ns = framework.CreateTestingNamespace("default", t)
 	}
 
 	// 2. Create kubeclient
@@ -133,7 +133,7 @@ func cleanupTest(t *testing.T, testCtx *testContext) {
 	testCtx.cancelFn()
 	// Cleanup nodes.
 	testCtx.clientSet.CoreV1().Nodes().DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{})
-	framework.DeleteTestingNamespace(testCtx.ns, testCtx.httpServer, t)
+	framework.DeleteTestingNamespace(testCtx.ns, t)
 	testCtx.closeFn()
 }