diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0e06d9ef80..5a0330c618 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-02  Luis Machado  <lgustavo@codesourcery.com>
+
+	* gdb.base/ovldbreak.exp (take_gdb_out_of_choice_menu): Restore
+	timeout handling.
+
 2016-12-02  Tom Tromey  <tom@tromey.com>
 
 	* gdb.dwarf2/main-subprogram.c: New file.
diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp
index b6c5efd7cc..2c1ff6c990 100644
--- a/gdb/testsuite/gdb.cp/ovldbreak.exp
+++ b/gdb/testsuite/gdb.cp/ovldbreak.exp
@@ -58,6 +58,10 @@ proc take_gdb_out_of_choice_menu {} {
     gdb_test_multiple " " " " {
         -re ".*$gdb_prompt $" {
         }
+	timeout {
+	    perror "could not resynchronize to command prompt (timeout)"
+	    continue
+	}
     }
 }