diff --git a/.github/workflows/aws-e2e-tests-non-root.yaml b/.github/workflows/aws-e2e-tests-non-root.yaml
index 3b5edb86303e2..90e8f3d8d7851 100644
--- a/.github/workflows/aws-e2e-tests-non-root.yaml
+++ b/.github/workflows/aws-e2e-tests-non-root.yaml
@@ -31,7 +31,7 @@ env:
   GHA_ASSUME_ROLE: arn:aws:iam::307493967395:role/tf-aws-e2e-gha-role
   KUBERNETES_SERVICE_ASSUME_ROLE: arn:aws:iam::307493967395:role/tf-eks-discovery-ci-cluster-kubernetes-service-access-role
   DISCOVERY_SERVICE_ASSUME_ROLE: arn:aws:iam::307493967395:role/tf-eks-discovery-ci-cluster-discovery-service-access-role
-  DISCOVERED_CLUSTER_NAME: gha-discovery-ci
+  DISCOVERED_CLUSTER_NAME: gha-discovery-ci-eks-us-west-2-307493967395
 jobs:
   test:
     name: AWS E2E Tests (Non-root)
diff --git a/e2e/aws/eks_test.go b/e2e/aws/eks_test.go
index f17a9dc026147..273e3b0088221 100644
--- a/e2e/aws/eks_test.go
+++ b/e2e/aws/eks_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -90,7 +91,14 @@ func awsEKSDiscoveryMatchedCluster(t *testing.T) {
 		defer cancel()
 
 		clusters, err := authC.GetKubernetesClusters(ctx)
-		return err == nil && len(clusters) == 1 && clusters[0].GetName() == os.Getenv(discoveredClusterNameEnv)
+		if err != nil || len(clusters) == 0 {
+			return false
+		}
+		// Fail fast if the discovery service creates more than one cluster.
+		assert.Equal(t, 1, len(clusters))
+		// Fail fast if the discovery service creates a cluster with a different name.
+		assert.Equal(t, os.Getenv(discoveredClusterNameEnv), clusters[0].GetName())
+		return true
 	}, 3*time.Minute, 10*time.Second, "wait for the discovery service to create a cluster")
 
 	// Wait for the kubernetes service to create a KubernetesServer resource.