diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8ec0434e34..7cede727ce 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-18  Kevin Buettner  <kevinb@redhat.com>
+
+	* config/sid.exp (gdb_load): Add test for empty argument.  Adjust
+	return value to be compatible with gdb_run_cmd in lib/gdb.exp.
+	Remove call to gdb_unload.
+
 2007-07-17  Pedro Alves  <pedro_alves@portugalmail.pt>
 	    Daniel Jacobowitz  <dan@codesourcery.com>
 
diff --git a/gdb/testsuite/config/sid.exp b/gdb/testsuite/config/sid.exp
index 9990442975..71144674eb 100644
--- a/gdb/testsuite/config/sid.exp
+++ b/gdb/testsuite/config/sid.exp
@@ -175,8 +175,10 @@ proc gdb_load { arg } {
     global gdb_prompt
     global retval
 
-    gdb_unload
-    if [gdb_file_cmd $arg] then { return -1 }
+    if { $arg != "" } {
+	if [gdb_file_cmd $arg] then { return -1 }
+    }
+
     gdb_target_sid
 
     send_gdb "load\n"
@@ -195,7 +197,7 @@ proc gdb_load { arg } {
 	    if $verbose>1 then {
 		send_user "Loaded $arg into $GDB\n"
 	    }
-	    set retval 1;
+	    set retval 0;
 	}
 	-re "$gdb_prompt $"     {
 	    if $verbose>1 then {