diff --git a/go/test/endtoend/vtgate/errors_as_warnings/main_test.go b/go/test/endtoend/vtgate/errors_as_warnings/main_test.go
index 01eff7b1c34..c1dbc45c421 100644
--- a/go/test/endtoend/vtgate/errors_as_warnings/main_test.go
+++ b/go/test/endtoend/vtgate/errors_as_warnings/main_test.go
@@ -139,10 +139,17 @@ func TestScatterErrsAsWarns(t *testing.T) {
 			utils.Exec(t, mode.conn, "use @replica")
 			utils.Exec(t, mode.conn, fmt.Sprintf("set workload = %s", mode.m))
 
+			expectedWarnings := []string{
+				"operation not allowed in state NOT_SERVING",
+				"operation not allowed in state SHUTTING_DOWN",
+				"no valid tablet",
+				"no healthy tablet",
+				"mysql.sock: connect: no such file or directory",
+			}
 			utils.AssertMatches(t, mode.conn, query1, `[[INT64(4)]]`)
-			assertContainsOneOf(t, mode.conn, showQ, "operation not allowed in state SHUTTING_DOWN", "no valid tablet", "no healthy tablet", "mysql.sock: connect: no such file or directory")
+			assertContainsOneOf(t, mode.conn, showQ, expectedWarnings...)
 			utils.AssertMatches(t, mode.conn, query2, `[[INT64(4)]]`)
-			assertContainsOneOf(t, mode.conn, showQ, "operation not allowed in state SHUTTING_DOWN", "no valid tablet", "no healthy tablet", "mysql.sock: connect: no such file or directory")
+			assertContainsOneOf(t, mode.conn, showQ, expectedWarnings...)
 
 			// invalid_field should throw error and not warning
 			_, err = mode.conn.ExecuteFetch("SELECT /*vt+ PLANNER=Gen4 SCATTER_ERRORS_AS_WARNINGS */ invalid_field from t1;", 1, false)