diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0c2f47b5f2b..8001ec1a629 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-29  Tom de Vries  <tdevries@suse.de>
+
+	* lib/gdb.exp (unknown): Make test-case unresolved.
+
 2020-06-29  Tom de Vries  <tdevries@suse.de>
 
 	PR gdb/25475
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index af3e02dac58..b0faf622a9e 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -5103,6 +5103,8 @@ proc default_gdb_init { test_file_name } {
 	rename ::unknown ::dejagnu_unknown
 	proc unknown { args } {
 	    # Use tcl's unknown.
+	    set cmd [lindex $args 0]
+	    unresolved "testcase aborted due to invalid command name: $cmd"
 	    return [uplevel 1 ::gdb_tcl_unknown $args]
 	}
     }