diff --git a/src/test/recovery/t/021_row_visibility.pl b/src/test/recovery/t/021_row_visibility.pl
index 95516b05d01..8a466e56e0f 100644
--- a/src/test/recovery/t/021_row_visibility.pl
+++ b/src/test/recovery/t/021_row_visibility.pl
@@ -6,6 +6,7 @@ use warnings;
 use PostgresNode;
 use TestLib;
 use Test::More tests => 10;
+use Config;
 
 # Initialize primary node
 my $node_primary = get_new_node('primary');
@@ -167,6 +168,9 @@ sub send_query_and_wait
 	$$psql{run}->pump_nb();
 	while (1)
 	{
+		# See PostgresNode.pm's psql()
+		$$psql{stdout} =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
+
 		last if $$psql{stdout} =~ /$untl/;
 
 		if ($psql_timeout->is_expired)