diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0c2a6aa46b..a710243fe4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-24  Keith Seitz  <keiths@redhat.com>
+
+	PR breakpoint/12803
+	* gdb.cp/cmpd-minsyms.cc (a): New method.
+	(b): New method.
+	(c): New method.
+	* gdb.cp/cmpd-minsyms.exp: Add tests for new methods.
+
 2011-05-24  Pedro Alves  <pedro@codesourcery.com>
 
 	* gdb.base/commands.exp (watchpoint_command_test): Check that the
diff --git a/gdb/testsuite/gdb.cp/cmpd-minsyms.cc b/gdb/testsuite/gdb.cp/cmpd-minsyms.cc
index 21d5c4e4db..fa667861aa 100644
--- a/gdb/testsuite/gdb.cp/cmpd-minsyms.cc
+++ b/gdb/testsuite/gdb.cp/cmpd-minsyms.cc
@@ -25,11 +25,17 @@ class GDB
    static X even_harder (T a) { return static_cast<X> (a); }
    int operator == (GDB const& other)
    { return 1; }
+  void a (void) const { }
+  void b (void) volatile { }
+  void c (void) const volatile { }
 };
 
 int main(int argc, char **argv)
 {
    GDB<int> a, b;
+   a.a ();
+   a.b ();
+   a.c ();
    if (a == b)
      return GDB<char>::harder('a') + GDB<int>::harder(3)
 	+ GDB<char>::even_harder<int> ('a');
diff --git a/gdb/testsuite/gdb.cp/cmpd-minsyms.exp b/gdb/testsuite/gdb.cp/cmpd-minsyms.exp
index 36176fc356..696022e966 100644
--- a/gdb/testsuite/gdb.cp/cmpd-minsyms.exp
+++ b/gdb/testsuite/gdb.cp/cmpd-minsyms.exp
@@ -19,13 +19,26 @@
 
 if {[skip_cplus_tests]} { continue }
 
-# Test for c++/12273
+# Tests for c++/12273, breakpoint/12803
 set testfile "cmpd-minsyms"
 # Do NOT compile with debug flag.
 if {[prepare_for_testing $testfile $testfile $testfile.cc {c++}]} {
     return -1
 }
 
+# Before setting the language, try to set a few simple breakpoints
+set min_syms [list \
+		  "GDB<int>::a() const" \
+		  "GDB<int>::b() volatile" \
+		  "GDB<int>::c() const volatile"]
+foreach sym $min_syms {
+    set tst "setting breakpoint at '$sym'"
+    if {[gdb_breakpoint "'$sym'"]} {
+	pass $tst
+    }    
+}
+
+
 gdb_test_no_output "set language c++"
 
 # A list of minimal symbol names to check.