diff --git a/gdb/testsuite/config/mips-gdb.exp b/gdb/testsuite/config/mips-gdb.exp
index c15dfb2514e..38ce30ff3ee 100644
--- a/gdb/testsuite/config/mips-gdb.exp
+++ b/gdb/testsuite/config/mips-gdb.exp
@@ -203,6 +203,12 @@ expect_after {
     "Undefined command"	   { error "send string probably wrong." }
 }
 
+proc gdb_exit { } {
+    global shell_id
+    exit_remote_shell $shell_id
+    catch default_gdb_exit
+}
+
 gdb_start
 
 # make sure gdb has actually started, otherwise if the first test