diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0ff00d4f687..2cf3a6282d3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-05  Joseph Myers  <joseph@codesourcery.com>
+
+	* lib/gcc-dg.exp (remove-build-file): Remove files on remote host
+	as well as on build.
+
 2008-07-04  Richard Guenther  <rguenther@suse.de>
 
 	* gcc.dg/tree-ssa/pta-callused.c: New testcase.
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index 9a3f12b5131..8d308d42461 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -354,6 +354,11 @@ proc remove-build-file { pat } {
     set file_list "[glob -nocomplain $pat]"
     verbose "remove-build-file `$file_list'" 2
     foreach output_file $file_list {
+	if [is_remote host] {
+	    # Ensure the host knows the file is gone by deleting there
+	    # first.
+	    remote_file host delete $output_file
+	}
 	remote_file build delete $output_file
     }
 }