diff --git a/go/mysql/server_test.go b/go/mysql/server_test.go
index 72b6f25d0c8..355d969d886 100644
--- a/go/mysql/server_test.go
+++ b/go/mysql/server_test.go
@@ -1424,7 +1424,13 @@ func TestListenerShutdown(t *testing.T) {
 
 	l.Shutdown()
 
+<<<<<<< HEAD
 	waitForConnRefuse(t, 1)
+=======
+	require.Eventually(t, func() bool {
+		return connRefuse.Get() == 1
+	}, 1*time.Minute, 100*time.Millisecond, "could not reach the desired connRefuse value")
+>>>>>>> 2d1e96ac46 (Fix flakiness in `TestListenerShutdown` (#17024))
 
 	err = conn.Ping()
 	require.EqualError(t, err, "Server shutdown in progress (errno 1053) (sqlstate 08S01)")
@@ -1436,6 +1442,7 @@ func TestListenerShutdown(t *testing.T) {
 	require.Equal(t, "Server shutdown in progress", sqlErr.Message)
 }
 
+<<<<<<< HEAD
 func waitForConnRefuse(t *testing.T, valWanted int64) {
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
@@ -1454,6 +1461,8 @@ func waitForConnRefuse(t *testing.T, valWanted int64) {
 	}
 }
 
+=======
+>>>>>>> 2d1e96ac46 (Fix flakiness in `TestListenerShutdown` (#17024))
 func TestParseConnAttrs(t *testing.T) {
 	expected := map[string]string{
 		"_client_version": "8.0.11",