diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6c80a69e065..12491151c54 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-15  Christian Biesinger  <cbiesinger@google.com>
+
+	* lib/gdb.exp: When running on a mingw target, replace
+	/x/ with x:/.
+
 2019-08-14  Alan Hayward  <alan.hayward@arm.com>
 
 	* gdb.arch/aarch64-prologue.c: New test.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index edc8dfcdfde..af56e8aa128 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4724,6 +4724,10 @@ proc standard_output_file {basename} {
 
     set dir [make_gdb_parallel_path outputs $subdir $gdb_test_file_name]
     file mkdir $dir
+    # If running on MinGW, replace /c/foo with c:/foo
+    if { [ishost *-*-mingw*] } {
+        set dir [regsub {^/([a-z])/} $dir {\1:/}]
+    }
     return [file join $dir $basename]
 }