diff --git a/test/e2e/framework/gateways.go b/test/e2e/framework/gateways.go
index 01f9a72d3..265fd1e83 100644
--- a/test/e2e/framework/gateways.go
+++ b/test/e2e/framework/gateways.go
@@ -39,11 +39,14 @@ var gatewayGVR = &schema.GroupVersionResource{
 
 func (f *Framework) AwaitGatewayWithStatus(cluster ClusterIndex, name, status string) *unstructured.Unstructured {
 	gwClient := gatewayClient(cluster)
-	// Set short name without a suffix as exists in the Gateway resource
-	name = strings.Split(name, ".")[0]
 	obj := AwaitUntil(fmt.Sprintf("await Gateway on %q with status %q", name, status),
 		func() (interface{}, error) {
 			resGw, err := gwClient.Get(context.TODO(), name, metav1.GetOptions{})
+			// Some environments sets a node in Gateway resource without a suffix
+			short_name := strings.Split(name, ".")[0]
+			if resGw == nil {
+				resGw, err = gwClient.Get(context.TODO(), short_name, metav1.GetOptions{})
+			}
 			if apierrors.IsNotFound(err) {
 				return nil, nil //nolint:nilnil // We want to repeat but let the checker known that nothing was found.
 			}
@@ -106,11 +109,14 @@ func (f *Framework) AwaitGatewayRemoved(cluster ClusterIndex, name string) {
 
 func (f *Framework) AwaitGatewayFullyConnected(cluster ClusterIndex, name string) *unstructured.Unstructured {
 	gwClient := gatewayClient(cluster)
-	// Set short name without a suffix as exists in the Gateway resource
-	name = strings.Split(name, ".")[0]
 	obj := AwaitUntil(fmt.Sprintf("await Gateway on %q with status active and connections UP", name),
 		func() (interface{}, error) {
 			resGw, err := gwClient.Get(context.TODO(), name, metav1.GetOptions{})
+			// Some environments sets a node in Gateway resource without a suffix
+			short_name := strings.Split(name, ".")[0]
+			if resGw == nil {
+				resGw, err = gwClient.Get(context.TODO(), short_name, metav1.GetOptions{})
+			}
 			if apierrors.IsNotFound(err) {
 				return nil, nil //nolint:nilnil // We want to repeat but let the checker known that nothing was found.
 			}