diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 01c11d5549b..cb8545315b0 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-28  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Joel Brobecker  <brobecker@adacore.com>
+
+	* lib/gdb.exp (gdb_test_multiple): Error on trailing newlines.
+
 2010-06-28  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.cp/static-print-quit.exp, gdb.cp/static-print-quit.cc: New.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c2014dd8ed6..d702dee8103 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -580,6 +580,10 @@ proc gdb_test_multiple { command message user_code } {
 	set message $command
     }
 
+    if [string match "*\[\r\n\]" $command] {
+	error "Invalid trailing newline in \"$message\" test"
+    }
+
     # TCL/EXPECT WART ALERT
     # Expect does something very strange when it receives a single braced
     # argument.  It splits it along word separators and performs substitutions.