diff --git a/test/e2e/base/manifests.yaml b/test/e2e/base/manifests.yaml
index 1727a667402..9b401cda00d 100644
--- a/test/e2e/base/manifests.yaml
+++ b/test/e2e/base/manifests.yaml
@@ -642,18 +642,3 @@ spec:
   - protocol: TCP
     port: 8000
     targetPort: 8000
----
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: ha-gateway
-  namespace: gateway-conformance-infra
-spec:
-  gatewayClassName: upgrade
-  listeners:
-  - allowedRoutes:
-      namespaces:
-        from: Same
-    name: http1
-    port: 80
-    protocol: HTTP
diff --git a/test/e2e/testdata/envoy-shutdown.yaml b/test/e2e/testdata/envoy-shutdown.yaml
index fdde229c71b..ec6aae94fdd 100644
--- a/test/e2e/testdata/envoy-shutdown.yaml
+++ b/test/e2e/testdata/envoy-shutdown.yaml
@@ -1,4 +1,19 @@
 apiVersion: gateway.networking.k8s.io/v1
+kind: Gateway
+metadata:
+  name: ha-gateway
+  namespace: gateway-conformance-infra
+spec:
+  gatewayClassName: upgrade
+  listeners:
+    - allowedRoutes:
+        namespaces:
+          from: Same
+      name: http1
+      port: 80
+      protocol: HTTP
+---
+apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: http-envoy-shutdown