diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index db01166b62..934498249b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+Tue Mar 16 15:37:11 1993  Fred Fish  (fnf@cygnus.com)
+
+	* config/unix-gdb.exp (gdb_exit):  Remove close commands that
+	may be called after gdb goes away.  Previous versions of expect
+	needed these to avoid file descriptor leaks, but they cause
+	errors with the current revision of expect.
+	* gdb.t00/gdbvars.exp:  Use -re on expected output after
+	setting sevenbit-strings.
+	* gdb.t04/setvar.exp, gdb.t13/bitfields.exp:  Make commands
+	to set sevenbit-strings consistent across tests.
+	**** start-sanitize-chill ****
+	gdb.t30/chexp.exp, gdb.t31/chillvars.exp:  Make commands to
+	set sevenbit-strings consistent across tests.
+	**** end-sanitize-chill ****
+
 Fri Mar 12 08:47:20 1993  Fred Fish  (fnf@cygnus.com)
 
 	* gdb.t21/demangle.exp (proc demangle):  Adjust quotes in an
diff --git a/gdb/testsuite/config/unix-gdb.exp b/gdb/testsuite/config/unix-gdb.exp
index 6ffd41d604..6245663998 100644
--- a/gdb/testsuite/config/unix-gdb.exp
+++ b/gdb/testsuite/config/unix-gdb.exp
@@ -134,9 +134,11 @@ proc gdb_exit {} {
     global GDBFLAGS
     set timeout 1
 
+    if $verbose>1 then {
+	send_user "Quitting $GDB $GDBFLAGS\n"
+    }    
     catch "send \"quit\n\"" result
     if [string match "write\(spawn_id=\[0-9\]+\): Bad file number" $result] then {
-	close
 	return 0
     }
     expect {
@@ -149,20 +151,16 @@ proc gdb_exit {} {
 	    if $verbose>1 then {
 		send_user "Got TIMEOUT from $GDB\n"
 	    }
+	    close
 	}
 	-re "The program is running.  Quit anyway? (y or n) $"\
 	    { send "y\n"
 		if $verbose>1 then {
 		    send_user "\t\tKilling program being debugged\n"
 		}
+	        close
 	    }
     }
-
-    close
-
-    if $verbose>1 then {
-	send_user "Quitting $GDB $GDBFLAGS\n"
-    }    
 }
 
 #