diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ca53ee1fc10..6ce82092954 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-18  Yao Qi  <yao@codesourcery.com>
+
+	* lib/gdb.exp (gdb_compile): Set
+	gdb_saved_set_unbuffered_mode_obj to
+	set_unbuffered_mode_saved.o if host is remote.  Invoke
+	remote_download to copy $unbuf_obj to host.
+
 2013-07-17  Doug Evans  <dje@google.com>
 
 	* gdb.python/py-frame-args.c: New file.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 376aacc0da2..fc9b0712bbc 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -2652,11 +2652,14 @@ proc gdb_compile {source dest type options} {
 		if { $result != "" } {
 		    return $result
 		}
-
-		set gdb_saved_set_unbuffered_mode_obj ${objdir}/set_unbuffered_mode_saved.o
+		if {[is_remote host]} {
+		    set gdb_saved_set_unbuffered_mode_obj set_unbuffered_mode_saved.o
+		} else {
+		    set gdb_saved_set_unbuffered_mode_obj ${objdir}/set_unbuffered_mode_saved.o
+		}
 		# Link a copy of the output object, because the
 		# original may be automatically deleted.
-		remote_exec host "cp -f $unbuf_obj $gdb_saved_set_unbuffered_mode_obj"
+		remote_download host $unbuf_obj $gdb_saved_set_unbuffered_mode_obj
 	    } else {
 		verbose "gdb_saved_set_unbuffered_obj already compiled"
 	    }