diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3795205309d..9c326d52431 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-11-17  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* gdb.gdb/unittest.exp: Spot 'Running...' lines.
+
 2020-11-17  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.base/completion.exp: Add new tests.
diff --git a/gdb/testsuite/gdb.gdb/unittest.exp b/gdb/testsuite/gdb.gdb/unittest.exp
index 20027b85e1f..28a14520f47 100644
--- a/gdb/testsuite/gdb.gdb/unittest.exp
+++ b/gdb/testsuite/gdb.gdb/unittest.exp
@@ -26,6 +26,13 @@ gdb_start
 
 set test "maintenance selftest"
 gdb_test_multiple $test $test {
+  -re ".*Running selftest \[^\n\r\]+\." {
+	# The selftests can take some time to complete.  To prevent
+	# timeout spot the 'Running ...' lines going past, so long as
+	# these are produced quickly enough then the overall test will
+	# not timeout.
+	exp_continue
+  }
   -re "Ran ($decimal) unit tests, 0 failed\r\n$gdb_prompt $" {
 	set num_ran $expect_out(1,string)
 	gdb_assert "$num_ran > 0" $test