diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b50169e588..55318f802c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-25  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* lib/mi-support.exp (mi_gdb_load): Use /tmp for gdbserver
+	downloads.
+	* config/gdbserver.exp (gdb_load): Likewise.
+
 2005-03-14  Paul Brook  <paul@codesourcery.com>
 
 	* lib/mi-support.exp: Use mi_gdb_target_cmd to connect to remote
diff --git a/gdb/testsuite/config/gdbserver.exp b/gdb/testsuite/config/gdbserver.exp
index 6dc6b23f49..61db50e3bf 100644
--- a/gdb/testsuite/config/gdbserver.exp
+++ b/gdb/testsuite/config/gdbserver.exp
@@ -2,7 +2,7 @@
 # ie. a debug agent running as a native process on the same or
 # a different host.
 
-#   Copyright 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -201,7 +201,7 @@ proc gdb_load { arg } {
 
     if { ! [info exists server_exec] } {
 	if [is_remote target] {
-	    set server_exec [remote_download target $host_exec]
+	    set server_exec [remote_download target $host_exec /tmp/[file tail $host_exec].[pid]]
 	} else {
 	    set server_exec $host_exec
 	}
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 6d1d867523..a8d2942dd0 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -1,4 +1,4 @@
-# Copyright 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -439,7 +439,7 @@ proc mi_gdb_load { arg } {
 
 	if { ! [info exists last_mi_remote_file] } {
 	    if [is_remote target] {
-		set last_mi_remote_file [remote_download target $arg]
+		set last_mi_remote_file [remote_download target $arg /tmp/[file tail $arg].[pid]]
 	    } else {
 		set last_mi_remote_file $last_mi_gdb_file
 	    }