diff --git a/test/integration/controller/admissionchecks/provisioning/provisioning_test.go b/test/integration/singlecluster/controller/admissionchecks/provisioning/provisioning_test.go
similarity index 100%
rename from test/integration/controller/admissionchecks/provisioning/provisioning_test.go
rename to test/integration/singlecluster/controller/admissionchecks/provisioning/provisioning_test.go
diff --git a/test/integration/controller/admissionchecks/provisioning/suite_test.go b/test/integration/singlecluster/controller/admissionchecks/provisioning/suite_test.go
similarity index 100%
rename from test/integration/controller/admissionchecks/provisioning/suite_test.go
rename to test/integration/singlecluster/controller/admissionchecks/provisioning/suite_test.go
diff --git a/test/integration/controller/core/admissioncheck_controller_test.go b/test/integration/singlecluster/controller/core/admissioncheck_controller_test.go
similarity index 100%
rename from test/integration/controller/core/admissioncheck_controller_test.go
rename to test/integration/singlecluster/controller/core/admissioncheck_controller_test.go
diff --git a/test/integration/controller/core/clusterqueue_controller_test.go b/test/integration/singlecluster/controller/core/clusterqueue_controller_test.go
similarity index 100%
rename from test/integration/controller/core/clusterqueue_controller_test.go
rename to test/integration/singlecluster/controller/core/clusterqueue_controller_test.go
diff --git a/test/integration/controller/core/localqueue_controller_test.go b/test/integration/singlecluster/controller/core/localqueue_controller_test.go
similarity index 100%
rename from test/integration/controller/core/localqueue_controller_test.go
rename to test/integration/singlecluster/controller/core/localqueue_controller_test.go
diff --git a/test/integration/controller/core/resourceflavor_controller_test.go b/test/integration/singlecluster/controller/core/resourceflavor_controller_test.go
similarity index 100%
rename from test/integration/controller/core/resourceflavor_controller_test.go
rename to test/integration/singlecluster/controller/core/resourceflavor_controller_test.go
diff --git a/test/integration/controller/core/suite_test.go b/test/integration/singlecluster/controller/core/suite_test.go
similarity index 100%
rename from test/integration/controller/core/suite_test.go
rename to test/integration/singlecluster/controller/core/suite_test.go
diff --git a/test/integration/controller/core/workload_controller_test.go b/test/integration/singlecluster/controller/core/workload_controller_test.go
similarity index 100%
rename from test/integration/controller/core/workload_controller_test.go
rename to test/integration/singlecluster/controller/core/workload_controller_test.go
diff --git a/test/integration/controller/jobframework/setup/setup_controllers_test.go b/test/integration/singlecluster/controller/jobframework/setup/setup_controllers_test.go
similarity index 100%
rename from test/integration/controller/jobframework/setup/setup_controllers_test.go
rename to test/integration/singlecluster/controller/jobframework/setup/setup_controllers_test.go
diff --git a/test/integration/controller/jobframework/setup/suite_test.go b/test/integration/singlecluster/controller/jobframework/setup/suite_test.go
similarity index 100%
rename from test/integration/controller/jobframework/setup/suite_test.go
rename to test/integration/singlecluster/controller/jobframework/setup/suite_test.go
diff --git a/test/integration/controller/jobs/appwrapper/appwrapper_controller_test.go b/test/integration/singlecluster/controller/jobs/appwrapper/appwrapper_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/appwrapper/appwrapper_controller_test.go
rename to test/integration/singlecluster/controller/jobs/appwrapper/appwrapper_controller_test.go
diff --git a/test/integration/controller/jobs/appwrapper/suite_test.go b/test/integration/singlecluster/controller/jobs/appwrapper/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/appwrapper/suite_test.go
rename to test/integration/singlecluster/controller/jobs/appwrapper/suite_test.go
diff --git a/test/integration/controller/jobs/job/job_controller_test.go b/test/integration/singlecluster/controller/jobs/job/job_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/job/job_controller_test.go
rename to test/integration/singlecluster/controller/jobs/job/job_controller_test.go
diff --git a/test/integration/controller/jobs/job/suite_test.go b/test/integration/singlecluster/controller/jobs/job/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/job/suite_test.go
rename to test/integration/singlecluster/controller/jobs/job/suite_test.go
diff --git a/test/integration/controller/jobs/jobset/jobset_controller_test.go b/test/integration/singlecluster/controller/jobs/jobset/jobset_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/jobset/jobset_controller_test.go
rename to test/integration/singlecluster/controller/jobs/jobset/jobset_controller_test.go
diff --git a/test/integration/controller/jobs/jobset/suite_test.go b/test/integration/singlecluster/controller/jobs/jobset/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/jobset/suite_test.go
rename to test/integration/singlecluster/controller/jobs/jobset/suite_test.go
diff --git a/test/integration/controller/jobs/kubeflow/kubeflowjob.go b/test/integration/singlecluster/controller/jobs/kubeflow/kubeflowjob.go
similarity index 100%
rename from test/integration/controller/jobs/kubeflow/kubeflowjob.go
rename to test/integration/singlecluster/controller/jobs/kubeflow/kubeflowjob.go
diff --git a/test/integration/controller/jobs/mpijob/mpijob_controller_test.go b/test/integration/singlecluster/controller/jobs/mpijob/mpijob_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/mpijob/mpijob_controller_test.go
rename to test/integration/singlecluster/controller/jobs/mpijob/mpijob_controller_test.go
diff --git a/test/integration/controller/jobs/mpijob/suite_test.go b/test/integration/singlecluster/controller/jobs/mpijob/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/mpijob/suite_test.go
rename to test/integration/singlecluster/controller/jobs/mpijob/suite_test.go
diff --git a/test/integration/controller/jobs/mxjob/mxjob_controller_test.go b/test/integration/singlecluster/controller/jobs/mxjob/mxjob_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/mxjob/mxjob_controller_test.go
rename to test/integration/singlecluster/controller/jobs/mxjob/mxjob_controller_test.go
diff --git a/test/integration/controller/jobs/mxjob/suite_test.go b/test/integration/singlecluster/controller/jobs/mxjob/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/mxjob/suite_test.go
rename to test/integration/singlecluster/controller/jobs/mxjob/suite_test.go
diff --git a/test/integration/controller/jobs/paddlejob/paddlejob_controller_test.go b/test/integration/singlecluster/controller/jobs/paddlejob/paddlejob_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/paddlejob/paddlejob_controller_test.go
rename to test/integration/singlecluster/controller/jobs/paddlejob/paddlejob_controller_test.go
diff --git a/test/integration/controller/jobs/paddlejob/suite_test.go b/test/integration/singlecluster/controller/jobs/paddlejob/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/paddlejob/suite_test.go
rename to test/integration/singlecluster/controller/jobs/paddlejob/suite_test.go
diff --git a/test/integration/controller/jobs/pod/pod_controller_test.go b/test/integration/singlecluster/controller/jobs/pod/pod_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/pod/pod_controller_test.go
rename to test/integration/singlecluster/controller/jobs/pod/pod_controller_test.go
diff --git a/test/integration/controller/jobs/pod/suite_test.go b/test/integration/singlecluster/controller/jobs/pod/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/pod/suite_test.go
rename to test/integration/singlecluster/controller/jobs/pod/suite_test.go
diff --git a/test/integration/controller/jobs/pytorchjob/pytorchjob_controller_test.go b/test/integration/singlecluster/controller/jobs/pytorchjob/pytorchjob_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/pytorchjob/pytorchjob_controller_test.go
rename to test/integration/singlecluster/controller/jobs/pytorchjob/pytorchjob_controller_test.go
diff --git a/test/integration/controller/jobs/pytorchjob/suite_test.go b/test/integration/singlecluster/controller/jobs/pytorchjob/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/pytorchjob/suite_test.go
rename to test/integration/singlecluster/controller/jobs/pytorchjob/suite_test.go
diff --git a/test/integration/controller/jobs/raycluster/raycluster_controller_test.go b/test/integration/singlecluster/controller/jobs/raycluster/raycluster_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/raycluster/raycluster_controller_test.go
rename to test/integration/singlecluster/controller/jobs/raycluster/raycluster_controller_test.go
diff --git a/test/integration/controller/jobs/raycluster/suite_test.go b/test/integration/singlecluster/controller/jobs/raycluster/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/raycluster/suite_test.go
rename to test/integration/singlecluster/controller/jobs/raycluster/suite_test.go
diff --git a/test/integration/controller/jobs/rayjob/rayjob_controller_test.go b/test/integration/singlecluster/controller/jobs/rayjob/rayjob_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/rayjob/rayjob_controller_test.go
rename to test/integration/singlecluster/controller/jobs/rayjob/rayjob_controller_test.go
diff --git a/test/integration/controller/jobs/rayjob/suite_test.go b/test/integration/singlecluster/controller/jobs/rayjob/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/rayjob/suite_test.go
rename to test/integration/singlecluster/controller/jobs/rayjob/suite_test.go
diff --git a/test/integration/controller/jobs/tfjob/suite_test.go b/test/integration/singlecluster/controller/jobs/tfjob/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/tfjob/suite_test.go
rename to test/integration/singlecluster/controller/jobs/tfjob/suite_test.go
diff --git a/test/integration/controller/jobs/tfjob/tfjob_controller_test.go b/test/integration/singlecluster/controller/jobs/tfjob/tfjob_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/tfjob/tfjob_controller_test.go
rename to test/integration/singlecluster/controller/jobs/tfjob/tfjob_controller_test.go
diff --git a/test/integration/controller/jobs/xgboostjob/suite_test.go b/test/integration/singlecluster/controller/jobs/xgboostjob/suite_test.go
similarity index 100%
rename from test/integration/controller/jobs/xgboostjob/suite_test.go
rename to test/integration/singlecluster/controller/jobs/xgboostjob/suite_test.go
diff --git a/test/integration/controller/jobs/xgboostjob/xgboostjob_controller_test.go b/test/integration/singlecluster/controller/jobs/xgboostjob/xgboostjob_controller_test.go
similarity index 100%
rename from test/integration/controller/jobs/xgboostjob/xgboostjob_controller_test.go
rename to test/integration/singlecluster/controller/jobs/xgboostjob/xgboostjob_controller_test.go
diff --git a/test/integration/importer/importer_test.go b/test/integration/singlecluster/importer/importer_test.go
similarity index 100%
rename from test/integration/importer/importer_test.go
rename to test/integration/singlecluster/importer/importer_test.go
diff --git a/test/integration/importer/suite_test.go b/test/integration/singlecluster/importer/suite_test.go
similarity index 100%
rename from test/integration/importer/suite_test.go
rename to test/integration/singlecluster/importer/suite_test.go
diff --git a/test/integration/kueuectl/create_test.go b/test/integration/singlecluster/kueuectl/create_test.go
similarity index 100%
rename from test/integration/kueuectl/create_test.go
rename to test/integration/singlecluster/kueuectl/create_test.go
diff --git a/test/integration/kueuectl/list_test.go b/test/integration/singlecluster/kueuectl/list_test.go
similarity index 100%
rename from test/integration/kueuectl/list_test.go
rename to test/integration/singlecluster/kueuectl/list_test.go
diff --git a/test/integration/kueuectl/passthrough_test.go b/test/integration/singlecluster/kueuectl/passthrough_test.go
similarity index 100%
rename from test/integration/kueuectl/passthrough_test.go
rename to test/integration/singlecluster/kueuectl/passthrough_test.go
diff --git a/test/integration/kueuectl/resume_test.go b/test/integration/singlecluster/kueuectl/resume_test.go
similarity index 100%
rename from test/integration/kueuectl/resume_test.go
rename to test/integration/singlecluster/kueuectl/resume_test.go
diff --git a/test/integration/kueuectl/stop_test.go b/test/integration/singlecluster/kueuectl/stop_test.go
similarity index 100%
rename from test/integration/kueuectl/stop_test.go
rename to test/integration/singlecluster/kueuectl/stop_test.go
diff --git a/test/integration/kueuectl/suite_test.go b/test/integration/singlecluster/kueuectl/suite_test.go
similarity index 100%
rename from test/integration/kueuectl/suite_test.go
rename to test/integration/singlecluster/kueuectl/suite_test.go
diff --git a/test/integration/kueuectl/util.go b/test/integration/singlecluster/kueuectl/util.go
similarity index 100%
rename from test/integration/kueuectl/util.go
rename to test/integration/singlecluster/kueuectl/util.go
diff --git a/test/integration/scheduler/fairsharing/fair_sharing_test.go b/test/integration/singlecluster/scheduler/fairsharing/fair_sharing_test.go
similarity index 100%
rename from test/integration/scheduler/fairsharing/fair_sharing_test.go
rename to test/integration/singlecluster/scheduler/fairsharing/fair_sharing_test.go
diff --git a/test/integration/scheduler/fairsharing/suite_test.go b/test/integration/singlecluster/scheduler/fairsharing/suite_test.go
similarity index 100%
rename from test/integration/scheduler/fairsharing/suite_test.go
rename to test/integration/singlecluster/scheduler/fairsharing/suite_test.go
diff --git a/test/integration/scheduler/podsready/scheduler_test.go b/test/integration/singlecluster/scheduler/podsready/scheduler_test.go
similarity index 100%
rename from test/integration/scheduler/podsready/scheduler_test.go
rename to test/integration/singlecluster/scheduler/podsready/scheduler_test.go
diff --git a/test/integration/scheduler/podsready/suite_test.go b/test/integration/singlecluster/scheduler/podsready/suite_test.go
similarity index 100%
rename from test/integration/scheduler/podsready/suite_test.go
rename to test/integration/singlecluster/scheduler/podsready/suite_test.go
diff --git a/test/integration/scheduler/preemption_test.go b/test/integration/singlecluster/scheduler/preemption_test.go
similarity index 100%
rename from test/integration/scheduler/preemption_test.go
rename to test/integration/singlecluster/scheduler/preemption_test.go
diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/singlecluster/scheduler/scheduler_test.go
similarity index 100%
rename from test/integration/scheduler/scheduler_test.go
rename to test/integration/singlecluster/scheduler/scheduler_test.go
diff --git a/test/integration/scheduler/suite_test.go b/test/integration/singlecluster/scheduler/suite_test.go
similarity index 100%
rename from test/integration/scheduler/suite_test.go
rename to test/integration/singlecluster/scheduler/suite_test.go
diff --git a/test/integration/scheduler/workload_controller_test.go b/test/integration/singlecluster/scheduler/workload_controller_test.go
similarity index 100%
rename from test/integration/scheduler/workload_controller_test.go
rename to test/integration/singlecluster/scheduler/workload_controller_test.go
diff --git a/test/integration/tas/suite_test.go b/test/integration/singlecluster/tas/suite_test.go
similarity index 100%
rename from test/integration/tas/suite_test.go
rename to test/integration/singlecluster/tas/suite_test.go
diff --git a/test/integration/tas/tas_test.go b/test/integration/singlecluster/tas/tas_test.go
similarity index 100%
rename from test/integration/tas/tas_test.go
rename to test/integration/singlecluster/tas/tas_test.go
diff --git a/test/integration/webhook/core/admissioncheck_test.go b/test/integration/singlecluster/webhook/core/admissioncheck_test.go
similarity index 100%
rename from test/integration/webhook/core/admissioncheck_test.go
rename to test/integration/singlecluster/webhook/core/admissioncheck_test.go
diff --git a/test/integration/webhook/core/clusterqueue_test.go b/test/integration/singlecluster/webhook/core/clusterqueue_test.go
similarity index 100%
rename from test/integration/webhook/core/clusterqueue_test.go
rename to test/integration/singlecluster/webhook/core/clusterqueue_test.go
diff --git a/test/integration/webhook/core/cohort_test.go b/test/integration/singlecluster/webhook/core/cohort_test.go
similarity index 100%
rename from test/integration/webhook/core/cohort_test.go
rename to test/integration/singlecluster/webhook/core/cohort_test.go
diff --git a/test/integration/webhook/core/localqueue_test.go b/test/integration/singlecluster/webhook/core/localqueue_test.go
similarity index 100%
rename from test/integration/webhook/core/localqueue_test.go
rename to test/integration/singlecluster/webhook/core/localqueue_test.go
diff --git a/test/integration/webhook/core/resourceflavor_test.go b/test/integration/singlecluster/webhook/core/resourceflavor_test.go
similarity index 100%
rename from test/integration/webhook/core/resourceflavor_test.go
rename to test/integration/singlecluster/webhook/core/resourceflavor_test.go
diff --git a/test/integration/webhook/core/suite_test.go b/test/integration/singlecluster/webhook/core/suite_test.go
similarity index 100%
rename from test/integration/webhook/core/suite_test.go
rename to test/integration/singlecluster/webhook/core/suite_test.go
diff --git a/test/integration/webhook/core/workload_test.go b/test/integration/singlecluster/webhook/core/workload_test.go
similarity index 100%
rename from test/integration/webhook/core/workload_test.go
rename to test/integration/singlecluster/webhook/core/workload_test.go
diff --git a/test/integration/webhook/jobs/deployment_webhook_test.go b/test/integration/singlecluster/webhook/jobs/deployment_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/deployment_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/deployment_webhook_test.go
diff --git a/test/integration/webhook/jobs/job_webhook_test.go b/test/integration/singlecluster/webhook/jobs/job_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/job_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/job_webhook_test.go
diff --git a/test/integration/webhook/jobs/jobset_webhook_test.go b/test/integration/singlecluster/webhook/jobs/jobset_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/jobset_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/jobset_webhook_test.go
diff --git a/test/integration/webhook/jobs/mpijob_webhook_test.go b/test/integration/singlecluster/webhook/jobs/mpijob_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/mpijob_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/mpijob_webhook_test.go
diff --git a/test/integration/webhook/jobs/mxjob_webhook_test.go b/test/integration/singlecluster/webhook/jobs/mxjob_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/mxjob_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/mxjob_webhook_test.go
diff --git a/test/integration/webhook/jobs/paddlejob_webhook_test.go b/test/integration/singlecluster/webhook/jobs/paddlejob_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/paddlejob_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/paddlejob_webhook_test.go
diff --git a/test/integration/webhook/jobs/pod_webhook_test.go b/test/integration/singlecluster/webhook/jobs/pod_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/pod_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/pod_webhook_test.go
diff --git a/test/integration/webhook/jobs/pytorchjob_webhook_test.go b/test/integration/singlecluster/webhook/jobs/pytorchjob_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/pytorchjob_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/pytorchjob_webhook_test.go
diff --git a/test/integration/webhook/jobs/raycluster_webhook_test.go b/test/integration/singlecluster/webhook/jobs/raycluster_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/raycluster_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/raycluster_webhook_test.go
diff --git a/test/integration/webhook/jobs/rayjob_webhook_test.go b/test/integration/singlecluster/webhook/jobs/rayjob_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/rayjob_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/rayjob_webhook_test.go
diff --git a/test/integration/webhook/jobs/statefulset_webhook_test.go b/test/integration/singlecluster/webhook/jobs/statefulset_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/statefulset_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/statefulset_webhook_test.go
diff --git a/test/integration/webhook/jobs/suite_test.go b/test/integration/singlecluster/webhook/jobs/suite_test.go
similarity index 100%
rename from test/integration/webhook/jobs/suite_test.go
rename to test/integration/singlecluster/webhook/jobs/suite_test.go
diff --git a/test/integration/webhook/jobs/tfjob_webhook_test.go b/test/integration/singlecluster/webhook/jobs/tfjob_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/tfjob_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/tfjob_webhook_test.go
diff --git a/test/integration/webhook/jobs/xgboostjob_webhook_test.go b/test/integration/singlecluster/webhook/jobs/xgboostjob_webhook_test.go
similarity index 100%
rename from test/integration/webhook/jobs/xgboostjob_webhook_test.go
rename to test/integration/singlecluster/webhook/jobs/xgboostjob_webhook_test.go