diff --git a/pkg/v1/tkg/test/tkgctl/aws_cc/aws_cc_calico_test.go b/pkg/v1/tkg/test/tkgctl/aws_cc/aws_cc_calico_test.go
new file mode 100644
index 0000000000..575abcae0d
--- /dev/null
+++ b/pkg/v1/tkg/test/tkgctl/aws_cc/aws_cc_calico_test.go
@@ -0,0 +1,26 @@
+// Copyright 2021 VMware, Inc. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// nolint:typecheck,nolintlint
+package aws_cc
+
+import (
+	"context"
+
+	. "github.com/onsi/ginkgo"
+
+	. "github.com/vmware-tanzu/tanzu-framework/pkg/v1/tkg/test/tkgctl/shared"
+)
+
+var _ = Describe("Functional tests for aws (clusterclass) - Calico", func() {
+	E2ECommonSpec(context.TODO(), func() E2ECommonSpecInput {
+		return E2ECommonSpecInput{
+			E2EConfig:       e2eConfig,
+			ArtifactsFolder: artifactsFolder,
+			Cni:             "calico",
+			Plan:            "dev",
+			Namespace:       "tkg-system",
+			OtherConfigs:    map[string]string{"clusterclass": "true"},
+		}
+	})
+})
diff --git a/pkg/v1/tkg/test/tkgctl/shared/e2e_common.go b/pkg/v1/tkg/test/tkgctl/shared/e2e_common.go
index 48b8f8376d..689ad4dd16 100644
--- a/pkg/v1/tkg/test/tkgctl/shared/e2e_common.go
+++ b/pkg/v1/tkg/test/tkgctl/shared/e2e_common.go
@@ -216,7 +216,7 @@ func E2ECommonSpec(ctx context.Context, inputGetter func() E2ECommonSpecInput) {
 				By(fmt.Sprintf("Verify workload cluster %q resources have been deleted", clusterName))
 				Eventually(func() bool {
 					return clusterResourcesDeleted(ctx, mngClient, clusterResources)
-				}, waitTimeout, pollingInterval).Should(BeTrue())
+				}, 2*waitTimeout, pollingInterval).Should(BeTrue())
 			}
 		}
 
diff --git a/pkg/v1/tkg/test/tkgctl/shared/package.go b/pkg/v1/tkg/test/tkgctl/shared/package.go
index 0329836bfb..603d0c17a1 100644
--- a/pkg/v1/tkg/test/tkgctl/shared/package.go
+++ b/pkg/v1/tkg/test/tkgctl/shared/package.go
@@ -267,7 +267,7 @@ func verifyClusterBootstrap(ctx context.Context, c client.Client, clusterBootstr
 		expectedClusterBootstrap.Spec.CNI.ValuesFrom.ProviderRef = &corev1.TypedLocalObjectReference{
 			APIGroup: &apiGroup,
 			Kind:     "CalicoConfig",
-			Name:     GeneratePackageSecretName(clusterBootstrap.Name, "calico"),
+			Name:     clusterBootstrap.Name,
 		}
 	}