diff --git a/test/ci_workflow_gen.go b/test/ci_workflow_gen.go
index 7cb97f9ea2d..76d3bf0c35b 100644
--- a/test/ci_workflow_gen.go
+++ b/test/ci_workflow_gen.go
@@ -172,7 +172,7 @@ type clusterTest struct {
 	Name, Shard, Platform              string
 	FileName                           string
 	BuildTag                           string
-	RunnerName                         string
+	RunsOn                             string
 	MemoryCheck                        bool
 	MakeTools, InstallXtraBackup       bool
 	Docker                             bool
@@ -268,7 +268,7 @@ func generateClusterWorkflows(list []string, tpl string) {
 			cores16Clusters := canonnizeList(clusterRequiring16CoresMachines)
 			for _, cores16Cluster := range cores16Clusters {
 				if cores16Cluster == cluster {
-					test.RunnerName = cores16RunnerName
+					test.RunsOn = cores16RunnerName
 					break
 				}
 			}
diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl
index 7d21a85af9e..f1fb52a42bc 100644
--- a/test/templates/cluster_endtoend_test.tpl
+++ b/test/templates/cluster_endtoend_test.tpl
@@ -15,7 +15,7 @@ jobs:
   build:
     timeout-minutes: 60
     name: Run endtoend tests on {{.Name}}
-    runs-on: {{if .RunnerName}}{{ .RunnerName }}{{else}}ubuntu-24.04{{end}}
+    runs-on: {{if .RunsOn}}{{ .RunsOn }}{{else}}ubuntu-24.04{{end}}
 
     steps:
     - name: Skip CI
diff --git a/test/templates/cluster_endtoend_test_docker.tpl b/test/templates/cluster_endtoend_test_docker.tpl
index e7f6d44d24e..1c862254304 100644
--- a/test/templates/cluster_endtoend_test_docker.tpl
+++ b/test/templates/cluster_endtoend_test_docker.tpl
@@ -6,7 +6,7 @@ permissions: read-all
 jobs:
   build:
     name: Run endtoend tests on {{.Name}}
-    runs-on: {{if .RunnerName}}{{ .RunnerName }}{{else}}ubuntu-24.04{{end}}
+    runs-on: {{if .RunsOn}}{{ .RunsOn }}{{else}}ubuntu-24.04{{end}}
 
     steps:
     - name: Skip CI
diff --git a/test/templates/cluster_endtoend_test_mysql57.tpl b/test/templates/cluster_endtoend_test_mysql57.tpl
index e3b9c3e1a5c..9fd42cc76d5 100644
--- a/test/templates/cluster_endtoend_test_mysql57.tpl
+++ b/test/templates/cluster_endtoend_test_mysql57.tpl
@@ -19,7 +19,7 @@ env:
 jobs:
   build:
     name: Run endtoend tests on {{.Name}}
-    runs-on: {{if .RunnerName}}{{ .RunnerName }}{{else}}ubuntu-24.04{{end}}
+    runs-on: {{if .RunsOn}}{{ .RunsOn }}{{else}}ubuntu-24.04{{end}}
 
     steps:
     - name: Skip CI