diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6ff8b26ea52..3d579ef94ad 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-27  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.base/readline.exp (operate_and_get_next): Match the final
+	prompt.
+
 2007-07-23  Kevin Buettner  <kevinb@redhat.com>
 
 	* lib/mi-support.exp (mi_gdb_target_load): Do a "kill" prior
diff --git a/gdb/testsuite/gdb.base/readline.exp b/gdb/testsuite/gdb.base/readline.exp
index 2ad8580c84a..99c68bf88a9 100644
--- a/gdb/testsuite/gdb.base/readline.exp
+++ b/gdb/testsuite/gdb.base/readline.exp
@@ -139,6 +139,9 @@ proc operate_and_get_next {name args} {
     set count [expr {$count + 2}]
   }
 
+  # Match the prompt so the next test starts at the right place.
+  gdb_test "" "" "$name - final prompt"
+
   return 1
 }