diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index efabcdf671d..2c75cea4e40 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-23 Sandra Loosemore <sandra@codesourcery.com>
+
+	* gdb.cp/var-tag.exp (do_global_tests): Generalize opt_underlying
+	to allow any size enum.
+
 2015-09-23  Pierre-Marie de Rodat  <derodat@adacore.com>
 
 	* gdb.ada/array_ptr_renaming.exp: New testcase.
diff --git a/gdb/testsuite/gdb.cp/var-tag.exp b/gdb/testsuite/gdb.cp/var-tag.exp
index 71d92378507..6dc198c2752 100644
--- a/gdb/testsuite/gdb.cp/var-tag.exp
+++ b/gdb/testsuite/gdb.cp/var-tag.exp
@@ -30,7 +30,7 @@ proc do_global_tests {lang} {
     set invalid_print "Attempt to use a type name as an expression"
 
     if {$lang == "c++"} {
-	set opt_underlying "(: unsigned int )?"
+	set opt_underlying "(: unsigned (int|short|char) )?"
     } else {
 	set opt_underlying ""
     }