diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8cff646760..b1ca924c2f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-12  Joseph Myers  <joseph@codesourcery.com>
+
+	* lib/gdb.exp (gdb_file_cmd): Check for case where $arg.exe exists
+	but $arg does not.
+
 2020-11-12  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.fortran/types.exp: Add more tests.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 55154db6a5..c42933b3f4 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1846,6 +1846,11 @@ proc gdb_file_cmd { arg } {
     global GDB
     global last_loaded_file
 
+    # GCC for Windows target may create foo.exe given "-o foo".
+    if { ![file exists $arg] && [file exists "$arg.exe"] } {
+	set arg "$arg.exe"
+    }
+
     # Save this for the benefit of gdbserver-support.exp.
     set last_loaded_file $arg