diff --git a/test/integration/apiserver/openapi/main_test.go b/test/integration/apiserver/openapi/main_test.go
new file mode 100644
index 00000000000..9f09d8336c6
--- /dev/null
+++ b/test/integration/apiserver/openapi/main_test.go
@@ -0,0 +1,27 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package openapi
+
+import (
+	"testing"
+
+	"k8s.io/kubernetes/test/integration/framework"
+)
+
+func TestMain(m *testing.M) {
+	framework.EtcdMain(m.Run)
+}
diff --git a/test/integration/apiserver/openapi_test.go b/test/integration/apiserver/openapi/openapi_test.go
similarity index 99%
rename from test/integration/apiserver/openapi_test.go
rename to test/integration/apiserver/openapi/openapi_test.go
index 6d320f42779..32c93234da3 100644
--- a/test/integration/apiserver/openapi_test.go
+++ b/test/integration/apiserver/openapi/openapi_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package apiserver
+package openapi
 
 import (
 	"encoding/json"
diff --git a/test/integration/apiserver/openapiv3_test.go b/test/integration/apiserver/openapi/openapiv3_test.go
similarity index 99%
rename from test/integration/apiserver/openapiv3_test.go
rename to test/integration/apiserver/openapi/openapiv3_test.go
index 72ab788809d..a3ffa891459 100644
--- a/test/integration/apiserver/openapiv3_test.go
+++ b/test/integration/apiserver/openapi/openapiv3_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package apiserver
+package openapi
 
 import (
 	"context"
diff --git a/test/integration/controlplane/audit_test.go b/test/integration/controlplane/audit/audit_test.go
similarity index 99%
rename from test/integration/controlplane/audit_test.go
rename to test/integration/controlplane/audit/audit_test.go
index 1527f332ab6..6bda88ed0aa 100644
--- a/test/integration/controlplane/audit_test.go
+++ b/test/integration/controlplane/audit/audit_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controlplane
+package audit
 
 import (
 	"context"
diff --git a/test/integration/controlplane/audit/main_test.go b/test/integration/controlplane/audit/main_test.go
new file mode 100644
index 00000000000..92bea609f38
--- /dev/null
+++ b/test/integration/controlplane/audit/main_test.go
@@ -0,0 +1,27 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package audit
+
+import (
+	"testing"
+
+	"k8s.io/kubernetes/test/integration/framework"
+)
+
+func TestMain(m *testing.M) {
+	framework.EtcdMain(m.Run)
+}
diff --git a/test/integration/controlplane/kms_transformation_test.go b/test/integration/controlplane/transformation/kms_transformation_test.go
similarity index 99%
rename from test/integration/controlplane/kms_transformation_test.go
rename to test/integration/controlplane/transformation/kms_transformation_test.go
index 6640f695093..08f0f0a3da8 100644
--- a/test/integration/controlplane/kms_transformation_test.go
+++ b/test/integration/controlplane/transformation/kms_transformation_test.go
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controlplane
+package transformation
 
 import (
 	"bytes"
diff --git a/test/integration/controlplane/transformation/main_test.go b/test/integration/controlplane/transformation/main_test.go
new file mode 100644
index 00000000000..575b438c50c
--- /dev/null
+++ b/test/integration/controlplane/transformation/main_test.go
@@ -0,0 +1,27 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package transformation
+
+import (
+	"testing"
+
+	"k8s.io/kubernetes/test/integration/framework"
+)
+
+func TestMain(m *testing.M) {
+	framework.EtcdMain(m.Run)
+}
diff --git a/test/integration/controlplane/secrets_transformation_test.go b/test/integration/controlplane/transformation/secrets_transformation_test.go
similarity index 99%
rename from test/integration/controlplane/secrets_transformation_test.go
rename to test/integration/controlplane/transformation/secrets_transformation_test.go
index 6c0090dbab2..b899237a937 100644
--- a/test/integration/controlplane/secrets_transformation_test.go
+++ b/test/integration/controlplane/transformation/secrets_transformation_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controlplane
+package transformation
 
 import (
 	"context"
diff --git a/test/integration/controlplane/transformation_testcase.go b/test/integration/controlplane/transformation/transformation_testcase.go
similarity index 99%
rename from test/integration/controlplane/transformation_testcase.go
rename to test/integration/controlplane/transformation/transformation_testcase.go
index 82e8d8b0bc0..48af30bba43 100644
--- a/test/integration/controlplane/transformation_testcase.go
+++ b/test/integration/controlplane/transformation/transformation_testcase.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controlplane
+package transformation
 
 import (
 	"bytes"
diff --git a/test/integration/daemonset/daemonset_test.go b/test/integration/daemonset/daemonset_test.go
index 2d5e9fa4fb6..f3d9b00ff25 100644
--- a/test/integration/daemonset/daemonset_test.go
+++ b/test/integration/daemonset/daemonset_test.go
@@ -438,7 +438,7 @@ func TestOneNodeDaemonLaunchesPod(t *testing.T) {
 		setupScheduler(ctx, t, clientset, informers)
 
 		informers.Start(ctx.Done())
-		go dc.Run(ctx, 5)
+		go dc.Run(ctx, 2)
 
 		ds := newDaemonSet("foo", ns.Name)
 		ds.Spec.UpdateStrategy = *strategy
@@ -474,7 +474,7 @@ func TestSimpleDaemonSetLaunchesPods(t *testing.T) {
 		defer cancel()
 
 		informers.Start(ctx.Done())
-		go dc.Run(ctx, 5)
+		go dc.Run(ctx, 2)
 
 		// Start Scheduler
 		setupScheduler(ctx, t, clientset, informers)
@@ -510,7 +510,7 @@ func TestDaemonSetWithNodeSelectorLaunchesPods(t *testing.T) {
 		defer cancel()
 
 		informers.Start(ctx.Done())
-		go dc.Run(ctx, 5)
+		go dc.Run(ctx, 2)
 
 		// Start Scheduler
 		setupScheduler(ctx, t, clientset, informers)
@@ -579,7 +579,7 @@ func TestNotReadyNodeDaemonDoesLaunchPod(t *testing.T) {
 		defer cancel()
 
 		informers.Start(ctx.Done())
-		go dc.Run(ctx, 5)
+		go dc.Run(ctx, 2)
 
 		// Start Scheduler
 		setupScheduler(ctx, t, clientset, informers)
@@ -626,7 +626,7 @@ func TestInsufficientCapacityNode(t *testing.T) {
 		defer cancel()
 
 		informers.Start(ctx.Done())
-		go dc.Run(ctx, 5)
+		go dc.Run(ctx, 2)
 
 		// Start Scheduler
 		setupScheduler(ctx, t, clientset, informers)
@@ -689,7 +689,7 @@ func TestLaunchWithHashCollision(t *testing.T) {
 	defer cancel()
 
 	informers.Start(ctx.Done())
-	go dc.Run(ctx, 5)
+	go dc.Run(ctx, 2)
 
 	// Start Scheduler
 	setupScheduler(ctx, t, clientset, informers)
@@ -800,7 +800,7 @@ func TestDSCUpdatesPodLabelAfterDedupCurHistories(t *testing.T) {
 	defer cancel()
 
 	informers.Start(ctx.Done())
-	go dc.Run(ctx, 5)
+	go dc.Run(ctx, 2)
 
 	// Start Scheduler
 	setupScheduler(ctx, t, clientset, informers)
@@ -929,7 +929,7 @@ func TestTaintedNode(t *testing.T) {
 		defer cancel()
 
 		informers.Start(ctx.Done())
-		go dc.Run(ctx, 5)
+		go dc.Run(ctx, 2)
 
 		// Start Scheduler
 		setupScheduler(ctx, t, clientset, informers)
@@ -994,7 +994,7 @@ func TestUnschedulableNodeDaemonDoesLaunchPod(t *testing.T) {
 		defer cancel()
 
 		informers.Start(ctx.Done())
-		go dc.Run(ctx, 5)
+		go dc.Run(ctx, 2)
 
 		// Start Scheduler
 		setupScheduler(ctx, t, clientset, informers)