diff --git a/tests/cloudsql/cloudsql_wait_for_operation_test.go b/tests/cloudsql/cloudsql_wait_for_operation_test.go
index 33c48077f2..e8225f8380 100644
--- a/tests/cloudsql/cloudsql_wait_for_operation_test.go
+++ b/tests/cloudsql/cloudsql_wait_for_operation_test.go
@@ -206,10 +206,10 @@ func TestCloudSQLWaitToolEndpoints(t *testing.T) {
 			wantSubstring: true,
 		},
 		{
-			name:        "failed operation",
-			toolName:    "wait-for-op2",
-			body:        `{"project": "p1", "operation": "op2"}`,
-			expectError: true,
+			name:          "failed operation - agent error",
+			toolName:      "wait-for-op2",
+			body:          `{"project": "p1", "operation": "op2"}`,
+			wantSubstring: true,
 		},
 		{
 			name:     "non-database create operation",