diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f0e4d73410..2d8b3ac83d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-23  Michael Chastain  <mec@shout.net>
+
+	* gdb.c++/templates.exp: Remove setup_xfail_format "stabs" on
+	test "ptype bint".  The test passes on all my stabs configurations.
+
 2002-02-21  Jim Blandy  <jimb@redhat.com>
 
 	* gdb.asm/asm-source.exp: Parse the output from `info sources' one
diff --git a/gdb/testsuite/gdb.c++/templates.exp b/gdb/testsuite/gdb.c++/templates.exp
index 45909f0069..a6d35fcb11 100644
--- a/gdb/testsuite/gdb.c++/templates.exp
+++ b/gdb/testsuite/gdb.c++/templates.exp
@@ -316,11 +316,7 @@ gdb_expect {
 
 
 # ptype Bar<int,33>
-# stabs screws this test royally. 
-# It thinks it has a badly mangled name.
-# I blame stabs, the other formats get it right. -djb
-get_debug_format
-setup_xfail_format "stabs"
+
 send_gdb "ptype bint\n"   
 gdb_expect {   
    -re "type = (class |)Bar<int,(\\(int\\)|)33> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*.*int bar\\(int, int\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype bint" }