diff --git a/test/e2e/agent/config_test.go b/test/e2e/agent/config_test.go
index 5a247761bb..125452e64f 100644
--- a/test/e2e/agent/config_test.go
+++ b/test/e2e/agent/config_test.go
@@ -124,6 +124,9 @@ func TestMultipleOutputConfig(t *testing.T) {
 }
 
 func TestFleetMode(t *testing.T) {
+
+	test.SkipUntilResolution(t, 6331)
+
 	v := version.MustParse(test.Ctx().ElasticStackVersion)
 	// installation of policies and integrations through Kibana file based configuration was broken between those versions:
 	if v.LT(version.MinFor(8, 1, 0)) && v.GTE(version.MinFor(8, 0, 0)) {
diff --git a/test/e2e/agent/recipes_test.go b/test/e2e/agent/recipes_test.go
index 8bdb65b6e1..a6de84b295 100644
--- a/test/e2e/agent/recipes_test.go
+++ b/test/e2e/agent/recipes_test.go
@@ -88,8 +88,8 @@ func TestMultiOutputRecipe(t *testing.T) {
 }
 
 func TestFleetKubernetesIntegrationRecipe(t *testing.T) {
-	// This test is disabled until we understand why it is failing
-	t.Skip("TestFleetKubernetesIntegrationRecipe is disabled, see https://github.com/elastic/cloud-on-k8s/issues/6331")
+
+	test.SkipUntilResolution(t, 6331)
 
 	customize := func(builder agent.Builder) agent.Builder {
 		if !builder.Agent.Spec.FleetServerEnabled {
@@ -133,6 +133,9 @@ func TestFleetKubernetesIntegrationRecipe(t *testing.T) {
 }
 
 func TestFleetCustomLogsIntegrationRecipe(t *testing.T) {
+
+	test.SkipUntilResolution(t, 6331)
+
 	notLoggingPod := beat.NewPodBuilder("test")
 	loggingPod := beat.NewPodBuilder("test")
 	loggingPod.Pod.Namespace = "default"
@@ -159,6 +162,9 @@ func TestFleetCustomLogsIntegrationRecipe(t *testing.T) {
 }
 
 func TestFleetAPMIntegrationRecipe(t *testing.T) {
+
+	test.SkipUntilResolution(t, 6331)
+
 	customize := func(builder agent.Builder) agent.Builder {
 		if !builder.Agent.Spec.FleetServerEnabled {
 			return builder
diff --git a/test/e2e/agent/upgrade_test.go b/test/e2e/agent/upgrade_test.go
index e081429563..4072543146 100644
--- a/test/e2e/agent/upgrade_test.go
+++ b/test/e2e/agent/upgrade_test.go
@@ -16,6 +16,9 @@ import (
 )
 
 func TestAgentVersionUpgradeToLatest8x(t *testing.T) {
+
+	test.SkipUntilResolution(t, 6331)
+
 	srcVersion, dstVersion := test.GetUpgradePathTo8x(test.Ctx().ElasticStackVersion)
 
 	test.SkipInvalidUpgrade(t, srcVersion, dstVersion)
diff --git a/test/e2e/test/utils.go b/test/e2e/test/utils.go
index 479d1ff2ed..ca4109d2d8 100644
--- a/test/e2e/test/utils.go
+++ b/test/e2e/test/utils.go
@@ -177,3 +177,8 @@ func IsGKE(v version.Version) bool {
 	// cloud providers append the name of the k8s platform in the version prefix (e.g.: 1.21.6-gke.1503)
 	return strings.Contains(v.String(), "gke")
 }
+
+func SkipUntilResolution(t *testing.T, knownIssueNumber int) {
+	t.Helper()
+	t.Skipf("Skip until we understand why it is failing, see https://github.com/elastic/cloud-on-k8s/issues/%d", knownIssueNumber)
+}