diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 68a21f4cf05..4af502fa108 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-13  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.base/remote.exp: Delete the slowest load test.
+	Do not load with fixed packet sizes.
+
 2009-11-13  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.cp/virtfunc.exp (do_tests): If runto_main fails, give up.
diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
index 113c56b7aa4..c1cea87d05a 100644
--- a/gdb/testsuite/gdb.base/remote.exp
+++ b/gdb/testsuite/gdb.base/remote.exp
@@ -95,6 +95,11 @@ proc gdb_load_timed {executable class writesize} {
 	}
     }
 
+    # Do not try to load using fixed sizes; we may overflow the remote target.
+    if { $class == "fixed" } {
+	return
+    }
+
     set load_begin_time [clock clicks]
     set result [gdb_load $executable]
     set load_end_time [clock clicks]
@@ -106,8 +111,6 @@ proc gdb_load_timed {executable class writesize} {
     pass $test
 }
 
-gdb_load_timed $binfile "" {}
-
 # Typically about 400-1 bytes can be downloaded
 gdb_load_timed $binfile "limit" 398
 gdb_load_timed $binfile "limit" 400