diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1e1ee536745..c64aeda9372 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-21  Pedro Alves  <palves@redhat.com>
+
+	* gdb.threads/multi-create-ns-info-thr.exp: Return early if
+	runto_main fails.
+
 2015-02-20  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/solib-corrupted.exp: Expect "stap" as first column of
diff --git a/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp b/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
index 906532ea226..51e537ec3e3 100644
--- a/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
+++ b/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
@@ -25,7 +25,9 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}
 gdb_test_no_output "set pagination off"
 gdb_test_no_output "set non-stop on"
 
-runto_main
+if ![runto_main] {
+    return -1
+}
 
 # Create a breakpoint that does "info threads" when hit, which will be
 # just while other threads are being created or exiting.