diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4afb7098be..f2ea686eb4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-19  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* gdb.base/cond-eval-mode.exp: Fix the anticipated warning string.
+
 2012-03-17  Doug Evans  <dje@google.com>
 
 	* dg-extract-results.sh: Handle KFAILs.
diff --git a/gdb/testsuite/gdb.base/cond-eval-mode.exp b/gdb/testsuite/gdb.base/cond-eval-mode.exp
index dbbfc28bf9..965c4978a9 100644
--- a/gdb/testsuite/gdb.base/cond-eval-mode.exp
+++ b/gdb/testsuite/gdb.base/cond-eval-mode.exp
@@ -30,7 +30,7 @@ gdb_test_no_output $test_auto
 
 # If target-side condition evaluation is not supported, this warning will be
 # displayed.
-set warning "warning: Target does not support breakpoint condition evaluation.\r\nUsing GDB evaluation mode instead.\r\n"
+set warning "warning: Target does not support breakpoint condition evaluation.\r\nUsing host evaluation mode instead.\r\n"
 
 gdb_test_multiple $test_target $test_target {
     -re "$warning$gdb_prompt $" {