diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e81c85c1df7..e83ec799470 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-09-17  Pedro Alves  <pedro@palves.net>
+
+	* gdb.base/display.exp: Issue "set print asm-demangle on".
+
 2020-09-17  Pedro Alves  <pedro@palves.net>
 
 	* gdb.base/find.c: Include <string.h>.
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index a9d4f753ff9..242e13bc291 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -195,6 +195,9 @@ gdb_test "print j"   " = 0\[\\r\\n\]+"   "debug test output 3"
 # x/0 j doesn't produce any output and terminates PA64 process when testing
 gdb_test_no_output "x/0 j"
 
+# For when the test is built in C++ mode.
+gdb_test_no_output "set print asm-demangle on"
+
 gdb_test "print/0 j" ".*Item count other than 1 is meaningless.*"
 gdb_test "print/s sum" " = 1000" "ignored s"
 gdb_test "print/i sum" ".*Format letter.*is meaningless.*.*" "no i"