diff --git a/src/test/recovery/t/022_crash_temp_files.pl b/src/test/recovery/t/022_crash_temp_files.pl
index 03c8ae3bd71..41d8b74911f 100644
--- a/src/test/recovery/t/022_crash_temp_files.pl
+++ b/src/test/recovery/t/022_crash_temp_files.pl
@@ -6,7 +6,15 @@ use TestLib;
 use Test::More;
 use Config;
 
-plan tests => 9;
+if ($Config{osname} eq 'MSWin32')
+{
+	plan skip_all => 'tests hang on Windows';
+	exit;
+}
+else
+{
+	plan tests => 9;
+}
 
 
 # To avoid hanging while expecting some specific input from a psql
@@ -124,10 +132,8 @@ $killme_stderr2 = '';
 my $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid);
 is($ret, 0, 'killed process with KILL');
 
-# Explicitly shut down psql gracefully - to avoid hangs or worse on windows
-$killme_stdin .= "\\q\n";
+# Close psql session
 $killme->finish;
-$killme_stdin2 .= "\\q\n";
 $killme2->finish;
 
 # Wait till server restarts
@@ -214,10 +220,8 @@ $killme_stderr2 = '';
 $ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid);
 is($ret, 0, 'killed process with KILL');
 
-# Explicitly shut down psql gracefully - to avoid hangs or worse on windows
-$killme_stdin .= "\\q\n";
+# Close psql session
 $killme->finish;
-$killme_stdin2 .= "\\q\n";
 $killme2->finish;
 
 # Wait till server restarts