diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 682ac2f806..33788ad1fa 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix "ERROR: no fileid for" in the testsuite.
+	* lib/gdb.exp (gdb_finish): Check gdb_spawn_id.
+
 2014-02-12  Doug Evans  <dje@google.com>
 
 	* gdb.dwarf2/Makefile.in (EXECUTABLES): Add dwp-symlink.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 66dc8f7d9c..9e14da96b2 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3711,7 +3711,8 @@ proc gdb_finish { } {
     global cleanfiles
 
     # Give persistent gdbserver a chance to terminate before GDB is killed.
-    if {[info exists gdbserver_reconnect_p] && $gdbserver_reconnect_p} {
+    if {[info exists gdbserver_reconnect_p] && $gdbserver_reconnect_p
+	&& [info exists gdb_spawn_id]} {
 	send_gdb "kill\n";
 	gdb_expect 10 {
 	    -re "y or n" {