diff --git a/hosted/eks/k8s_chart_support/non_upgrade/k8s_chart_support_import_test.go b/hosted/eks/k8s_chart_support/non_upgrade/k8s_chart_support_import_test.go
index 85ec45ac..901a6305 100644
--- a/hosted/eks/k8s_chart_support/non_upgrade/k8s_chart_support_import_test.go
+++ b/hosted/eks/k8s_chart_support/non_upgrade/k8s_chart_support_import_test.go
@@ -41,7 +41,6 @@ var _ = Describe("K8sChartSupportImport", func() {
 			Expect(err).To(BeNil())
 			err = helper.DeleteEKSClusterOnAWS(region, clusterName)
 			Expect(err).To(BeNil())
-			// TODO: Force delete EKS cluster
 		} else {
 			fmt.Println("Skipping downstream cluster deletion: ", clusterName)
 		}
diff --git a/hosted/eks/k8s_chart_support/non_upgrade/k8s_chart_support_suite_test.go b/hosted/eks/k8s_chart_support/non_upgrade/k8s_chart_support_suite_test.go
index 86e65114..6f6add4d 100644
--- a/hosted/eks/k8s_chart_support/non_upgrade/k8s_chart_support_suite_test.go
+++ b/hosted/eks/k8s_chart_support/non_upgrade/k8s_chart_support_suite_test.go
@@ -146,9 +146,6 @@ func commonchecks(ctx *helpers.Context, cluster *management.Cluster) {
 		cluster, err = helper.ScaleNodeGroup(cluster, ctx.RancherClient, initialNodeCount)
 		Expect(err).To(BeNil())
 
-		//err = clusters.WaitClusterToBeUpgraded(ctx.RancherClient, cluster.ID)
-		//Expect(err).To(BeNil())
-
 		By("ensuring that the chart is re-installed to the latest version", func() {
 			Eventually(func() int {
 				charts := helpers.ListOperatorChart()
@@ -161,6 +158,7 @@ func commonchecks(ctx *helpers.Context, cluster *management.Cluster) {
 			}, tools.SetTimeout(1*time.Minute), 1*time.Second).Should(BeNumerically("==", 0))
 		})
 
+		// We do not use WaitClusterToBeUpgraded because it has been flaky here and times out
 		var upgradeSuccessful bool
 		Eventually(func() bool {
 			for i := range cluster.EKSConfig.NodeGroups {