diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fd41d1fbb1..dcc6eb6513 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-24  Michael Snyder  <msnyder@redhat.com>
+
+	* gdb.threads/pthreads.exp (test_startup): Relax test for thread
+	debugging.  If test fails, issue an "unsupported" not a "fail".
+
 2001-05-24  Jim Blandy  <jimb@redhat.com>
 
 	Don't assume that short is shorter than int.
diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index e58de79324..00140b6b33 100644
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ b/gdb/testsuite/gdb.threads/pthreads.exp
@@ -197,13 +197,11 @@ proc test_startup {} {
     # We should be able to do an info threads before starting any others.
     send_gdb "info threads\n"
     gdb_expect {
-	-re ".*Thread.*LWP.*main.*$gdb_prompt $" {
+	-re ".*Thread.*main.*$gdb_prompt $" {
 	    pass "info threads"
 	}
 	-re "\r\n$gdb_prompt $" {
-	    pass "info threads"
-	    setup_xfail "*-*-*"
-	    fail "gdb does not support pthreads for this machine"
+	    unsupported "gdb does not support pthreads for this machine"
 	    return 0
 	}
     }