diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 76e2883bcce..16c93dca78c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2017-11-27  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.ada/mi_catch_ex.exp (continue_to_exception): Adjust
+	expected output in gdb_expect call to allow the exception
+	message to be present as well.  Fix syntax confusion to avoid
+	TCL thinking that exception_name is an array.
+
 2017-11-26  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* gdb.arch/spu-info.c: Include <unistd.h>.
diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
index 2ca3b6c38fd..2440be56a97 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
@@ -87,7 +87,7 @@ proc continue_to_exception { exception_name exception_message test } {
 
     # Match console stream output.
     gdb_expect {
-	-re " $exception_name at $hex in foo " {
+	-re " $exception_name\( \\($exception_message\\)\)? at $hex in foo " {
 	}
 	timeout {
 	    fail "$test (timeout)"
@@ -97,7 +97,7 @@ proc continue_to_exception { exception_name exception_message test } {
 
     # Now MI stream output.
     mi_expect_stop \
-	"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"$exception_name(\",exception-message=\"$exception_message)?" \
+	"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"$exception_name\(\",exception-message=\"$exception_message\)?" \
 	"foo" "" ".*" ".*" \
 	".*" \
 	$test