diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6be7ded533..ead5e80c16 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-17  Nick Duffek  <nsd@redhat.com>
+
+	* lib/gdb.exp (gdb_test): Override timeout with board info.
+
 2000-11-17  Nick Duffek  <nsd@redhat.com>
 
 	* gdb.base/display.exp: Don't kill running stub.  Add "again" to
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c7990d1c7f..12c631a1a6 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -457,14 +457,18 @@ proc gdb_test { args } {
 	}
     }
 
-    if [info exists timeout] {
-	set tmt $timeout;
+    if [target_info exists gdb,timeout] {
+	set tmt [target_info gdb,timeout];
     } else {
-	global timeout;
 	if [info exists timeout] {
 	    set tmt $timeout;
 	} else {
-	    set tmt 60;
+	    global timeout;
+	    if [info exists timeout] {
+		set tmt $timeout;
+	    } else {
+		set tmt 60;
+	    }
 	}
     }
     gdb_expect $tmt {