diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 01c7705ec5..a994ddd12e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.base/commands.exp (cmd1 error): Fix false ERROR with gdbserver.
+
 2011-11-02  Stan Shebs  <stan@codesourcery.com>
 
 	* gdb.trace/collection.c: Add code using strings.
diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index 2c57986971..b4b14b58e9 100644
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -741,7 +741,7 @@ proc error_clears_commands_left {} {
     gdb_test_no_output "end" "main commands 2c"
 
     gdb_run_cmd
-    gdb_test "" "\r\nhook-stop1\r\n.*\r\ncmd1\r\nUndefined command: \"errorcommandxy\"\\.  Try \"help\"\\." "cmd1 error"
+    gdb_test "" "hook-stop1\r\n.*\r\ncmd1\r\nUndefined command: \"errorcommandxy\"\\.  Try \"help\"\\." "cmd1 error"
 
     gdb_test {echo idle\n} "\r\nidle" "no cmd2"
 }