diff --git a/test/e2e/tests/utils.go b/test/e2e/tests/utils.go
index 55f4ad5f944..f28c578e326 100644
--- a/test/e2e/tests/utils.go
+++ b/test/e2e/tests/utils.go
@@ -157,7 +157,7 @@ func runLoadAndWait(t *testing.T, timeoutConfig config.TimeoutConfig, done chan
 		RunnerOptions: periodic.RunnerOptions{
 			QPS: 5000,
 			// allow some overhead time for setting up workers and tearing down after restart
-			Duration:   timeoutConfig.CreateTimeout + timeoutConfig.CreateTimeout/2,
+			Duration:   timeoutConfig.CreateTimeout * 2,
 			NumThreads: 50,
 			Stop:       aborter,
 			Out:        io.Discard,
diff --git a/tools/make/kube.mk b/tools/make/kube.mk
index 8d8c96a76d2..5c17493562f 100644
--- a/tools/make/kube.mk
+++ b/tools/make/kube.mk
@@ -130,9 +130,9 @@ ifeq ($(E2E_RUN_TEST),)
 	go test -v -tags e2e ./test/e2e/upgrade --gateway-class=upgrade --debug=true --cleanup-base-resources=$(E2E_CLEANUP)
 else
 ifeq ($(E2E_RUN_EG_UPGRADE_TESTS),false)
-	go test -v -tags e2e ./test/e2e/merge_gateways --gateway-class=merge-gateways --debug=true --cleanup-base-resources=false \
+	go test -v -tags e2e ./test/e2e --gateway-class=envoy-gateway --debug=true --cleanup-base-resources=false \
 		--run-test $(E2E_RUN_TEST)
-	go test -v -tags e2e ./test/e2e --gateway-class=envoy-gateway --debug=true --cleanup-base-resources=$(E2E_CLEANUP) \
+	go test -v -tags e2e ./test/e2e/merge_gateways --gateway-class=merge-gateways --debug=true --cleanup-base-resources=$(E2E_CLEANUP) \
 		--run-test $(E2E_RUN_TEST)
 else
 	go test -v -tags e2e ./test/e2e/upgrade --gateway-class=upgrade --debug=true --cleanup-base-resources=$(E2E_CLEANUP) \