diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a369d1b33c..8be3e87692 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-04  Tom Tromey  <tom@tromey.com>
+
+	PR cli/22234:
+	* complaints.c: Emit \n.
+
 2018-10-04  Tom Tromey  <tom@tromey.com>
 
 	* symfile.c (symbol_file_add_with_addrs, symbol_file_clear)
diff --git a/gdb/complaints.c b/gdb/complaints.c
index 43ea7a18a7..ab61980b62 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -72,7 +72,7 @@ complaint_internal (const char *fmt, ...)
 	fprintf_filtered (gdb_stderr, "During symbol reading, %s.\n",
 			  msg.c_str ());
       else
-	fprintf_filtered (gdb_stderr, "%s...", msg.c_str ());
+	fprintf_filtered (gdb_stderr, "%s\n", msg.c_str ());
     }
 
   /* If GDB dumps core, we'd like to see the complaints first.
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8d7af7433a..17cff0b99b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2018-10-04  Tom Tromey  <tom@tromey.com>
+
+	PR cli/22234:
+	* gdb.dwarf2/dw2-stack-boundary.exp: Update expected output.
+	* gdb.gdb/complaints.exp (test_short_complaints): Update expected
+	output.
+
 2018-10-04  Tom Tromey  <tom@tromey.com>
 
 	* gdb.base/attach.exp (test_command_line_attach_run): Use -quiet;
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
index b38a579fe5..5be51f4356 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.exp
@@ -38,7 +38,7 @@ if [is_remote host] {
     }
 }
 gdb_test_no_output "set complaints 100"
-gdb_test "file $binfile" {Reading symbols from .*\.\.\.location description stack underflow\.\.\.location description stack overflow\.\.\..*done\.} "check partial symtab errors"
+gdb_test "file $binfile" {Reading symbols from .*\.\.\.location description stack underflow\r\nlocation description stack overflow\r\ndone\.} "check partial symtab errors"
 
 gdb_test "p underflow" {Asked for position 0 of stack, stack only has 0 elements on it\.}
 gdb_test "p overflow" " = 2"
diff --git a/gdb/testsuite/gdb.gdb/complaints.exp b/gdb/testsuite/gdb.gdb/complaints.exp
index 65b6bdc281..33ec268949 100644
--- a/gdb/testsuite/gdb.gdb/complaints.exp
+++ b/gdb/testsuite/gdb.gdb/complaints.exp
@@ -85,13 +85,13 @@ proc test_short_complaints { } {
     # Prime the system
     test_complaint \
 	"call complaint_internal (\"short line 1\")" \
-	"short line 1..." \
+	"short line 1" \
 	"short line 1"
 
     # Add a second complaint, expect it
     test_complaint \
 	"call complaint_internal (\"short line 2\")" \
-	"short line 2..." \
+	"short line 2" \
 	"short line 2"
 
     return 0