diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ffd314c30cc..c6c5260dd06 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-09  Pedro Alves  <palves@redhat.com>
+
+	* gdb.cp/cpcompletion.exp (test_class_complete): Tighten regex to
+	match till end of line.
+
 2017-11-09  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/memattr.exp: Tighten regexes to match the end line.
diff --git a/gdb/testsuite/gdb.cp/cpcompletion.exp b/gdb/testsuite/gdb.cp/cpcompletion.exp
index d4da1d2e3e0..c7883ee3766 100644
--- a/gdb/testsuite/gdb.cp/cpcompletion.exp
+++ b/gdb/testsuite/gdb.cp/cpcompletion.exp
@@ -26,7 +26,7 @@ proc test_class_complete {class expr name matches} {
     gdb_test_multiple $cmd $name {
 	"break ${class}::main" { fail "$name (saw global symbol)" }
 	$cmd { exp_continue }
-	-re "break ${class}::\[A-Za-z0-9_~\]+" {
+	-re "break ${class}::\[^\r\n\]*\r\n" {
 	    set str $expect_out(0,string)
 	    scan $str "break ${class}::%\[^(\]" method
 	    lappend seen $method