diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index de0b7bd75a4..a8c4d81780f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-24  Pedro Alves  <palves@redhat.com>
+
+	* gdb.arch/arc-tdesc-cpu.exp ('set tdesc filename'): Use gdb_test
+	with explicit test name.
+
 2017-10-20  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/quit.exp: Use gdb_test_multiple and expect 'eof' before
diff --git a/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp b/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp
index f1c009da1e2..13f677f66e1 100644
--- a/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp
+++ b/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp
@@ -26,10 +26,10 @@ gdb_start
 # doesn't pass architecture from the target description directly to the
 # disassembler and instead uses one of the valid CPU names.
 
-set filename $srcdir/$subdir/arc-tdesc-cpu.xml
-
-set cmd "set tdesc filename $filename"
-gdb_test $cmd
+gdb_test \
+    "set tdesc filename $srcdir/$subdir/arc-tdesc-cpu.xml" \
+    ".*" \
+    "set tdesc filename \$srcdir/$subdir/arc-tdesc-cpu.xml"
 
 # An error message is emitted by the disassembler, therefore it is not shown
 # unless the disassembler is actually invoked.  Address "0" is not invalid,