diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3868b97bb8..c09c0210c6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-08  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.cp/templates.exp (test_template_args): Allow "struct".
+
 2010-09-08  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.cp/templates.cc (Empty, FunctionArg): New classes.
diff --git a/gdb/testsuite/gdb.cp/templates.exp b/gdb/testsuite/gdb.cp/templates.exp
index c5313070e0..c17cf3df50 100644
--- a/gdb/testsuite/gdb.cp/templates.exp
+++ b/gdb/testsuite/gdb.cp/templates.exp
@@ -200,10 +200,10 @@ proc test_template_args {} {
 
     set empty_re "Empty *<void *\\(FunctionArg *<int>\\)>"
     gdb_test "ptype empty" \
-	"type = class $empty_re {.*<no data fields>.*}"
+	"type = (struct|class) $empty_re {.*<no data fields>.*}"
 
     gdb_test "ptype arg" \
-	"type = class FunctionArg<int> {.*int method\\($empty_re \\&\\);.*}"
+	"type = (struct|class) FunctionArg<int> {.*int method\\($empty_re \\&\\);.*}"
 }
 
 proc do_tests {} {