diff --git a/test/e2e/quick_start_test.go b/test/e2e/quick_start_test.go
index f5b9303a0..5d91c56df 100644
--- a/test/e2e/quick_start_test.go
+++ b/test/e2e/quick_start_test.go
@@ -41,7 +41,7 @@ var _ = Describe("Quick start", func() {
 
 		Context(provider, Label("provider:"+provider), providerSpecificDecorators, func() {
 			lowercaseProvider := strings.ToLower(provider)
-			for _, cniProvider := range []string{"Cilium", "Calico"} {
+			for _, cniProvider := range []string{"Cilium"} { // TODO: Reenable Calico tests later once we fix flakiness.
 				Context(cniProvider, Label("cni:"+cniProvider), func() {
 					for _, addonStrategy := range []string{"HelmAddon", "ClusterResourceSet"} {
 						Context(addonStrategy, Label("addonStrategy:"+addonStrategy), func() {
diff --git a/test/e2e/self_hosted_test.go b/test/e2e/self_hosted_test.go
index 6f38e23df..e6da326e7 100644
--- a/test/e2e/self_hosted_test.go
+++ b/test/e2e/self_hosted_test.go
@@ -34,7 +34,7 @@ var _ = Describe("Self-hosted", Serial, func() {
 		}
 		Context(provider, Label("provider:"+provider), providerSpecificDecorators, func() {
 			lowercaseProvider := strings.ToLower(provider)
-			for _, cniProvider := range []string{"Cilium", "Calico"} {
+			for _, cniProvider := range []string{"Cilium"} { // TODO: Reenable Calico tests later once we fix flakiness.
 				Context(cniProvider, Label("cni:"+cniProvider), func() {
 					for _, addonStrategy := range []string{"HelmAddon", "ClusterResourceSet"} {
 						Context(addonStrategy, Label("addonStrategy:"+addonStrategy), func() {