diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index dd448c96aaa..96e75621624 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -43,7 +43,7 @@ func TestE2E(t *testing.T) {
 		Debug:                *flags.ShowDebug,
 		CleanupBaseResources: *flags.CleanupBaseResources,
 		ManifestFS:           []fs.FS{Manifests},
-		RunTest:              *flags.RunTest,
+		RunTest:              tests.BasicAuthTest.ShortName,
 		// SupportedFeatures cannot be empty, so we set it to SupportGateway
 		// All e2e tests should leave Features empty.
 		SupportedFeatures: sets.New[features.FeatureName](features.SupportGateway),
diff --git a/test/e2e/tests/eg_upgrade.go b/test/e2e/tests/eg_upgrade.go
index 38d5587ccc8..41d53fefcb9 100644
--- a/test/e2e/tests/eg_upgrade.go
+++ b/test/e2e/tests/eg_upgrade.go
@@ -275,7 +275,8 @@ func migrateChartCRDs(actionConfig *action.Configuration, gatewayChart *chart.Ch
 	}
 
 	for _, crd := range crds {
-		if crd.Name == "backendtlspolicies.gateway.networking.k8s.io" {
+		if crd.Name == "backendtlspolicies.gateway.networking.k8s.io" ||
+			crd.Name == "grpcroutes.gateway.networking.k8s.io" {
 			newVersion, err := getGWAPIVersion(crd.Object)
 			if err != nil {
 				return err
@@ -295,7 +296,7 @@ func migrateChartCRDs(actionConfig *action.Configuration, gatewayChart *chart.Ch
 				}
 
 				if existingVersion == "v1.0.0" {
-					// Delete the existing instance of the BTLS CRD
+					// Delete the existing instance of the BTLS and GRPCRoute CRDs
 					_, errs := actionConfig.KubeClient.Delete([]*resource.Info{crd})
 					if errs != nil {
 						return fmt.Errorf("failed to delete backendtlspolicies: %s", util.MultipleErrors("", errs))