diff --git a/test/e2e/docker_test.go b/test/e2e/docker_test.go
index 5a5a826ae0dd..0951d4bef9da 100644
--- a/test/e2e/docker_test.go
+++ b/test/e2e/docker_test.go
@@ -951,7 +951,7 @@ func TestDockerUpgradeWorkloadClusterScaleAddRemoveWorkerNodeGroupsGitHubFluxAPI
 	)
 }
 
-func TestDockerCiliumUpgradeSkip_Create(t *testing.T) {
+func TestDockerCiliumSkipUpgrade_CLICreate(t *testing.T) {
 	provider := framework.NewDocker(t)
 	test := framework.NewClusterE2ETest(t, provider,
 		framework.WithClusterFiller(
@@ -971,7 +971,7 @@ func TestDockerCiliumUpgradeSkip_Create(t *testing.T) {
 	test.DeleteCluster()
 }
 
-func TestDockerCiliumSkipUpgrade_Upgrade(t *testing.T) {
+func TestDockerCiliumSkipUpgrade_CLIUpgrade(t *testing.T) {
 	release, err := framework.GetLatestMinorReleaseFromTestBranch()
 	if err != nil {
 		t.Fatal(err)
@@ -1007,7 +1007,7 @@ func TestDockerCiliumSkipUpgrade_Upgrade(t *testing.T) {
 	test.DeleteCluster()
 }
 
-func TestDockerCiliumUpgradeSkip_WorkloadCreate(t *testing.T) {
+func TestDockerCiliumSkipUpgrade_ControllerCreate(t *testing.T) {
 	provider := framework.NewDocker(t)
 	management := framework.NewClusterE2ETest(t, provider).WithClusterConfig(
 		api.ClusterToConfigFiller(
@@ -1053,7 +1053,7 @@ func TestDockerCiliumUpgradeSkip_WorkloadCreate(t *testing.T) {
 	test.DeleteManagementCluster()
 }
 
-func TestDockerCiliumUpgradeSkip_WorkloadUpgrade(t *testing.T) {
+func TestDockerCiliumSkipUpgrade_ControllerUpgrade(t *testing.T) {
 	provider := framework.NewDocker(t)
 	management := framework.NewClusterE2ETest(t, provider).WithClusterConfig(
 		api.ClusterToConfigFiller(
diff --git a/test/framework/workload.go b/test/framework/workload.go
index 243a1e7a618b..976b253fd890 100644
--- a/test/framework/workload.go
+++ b/test/framework/workload.go
@@ -104,7 +104,7 @@ func (w *WorkloadCluster) WaitForKubeconfig() {
 // ValidateClusterDelete verifies the cluster has been deleted.
 func (w *WorkloadCluster) ValidateClusterDelete() {
 	ctx := context.Background()
-	w.buildClusterStateValidationConfig(ctx)
+	// w.buildClusterStateValidationConfig(ctx)
 	w.T.Logf("Validating cluster deletion %s", w.ClusterName)
 	clusterStateValidator := newClusterStateValidator(w.clusterStateValidationConfig)
 	clusterStateValidator.WithValidations(