diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 97e0d1cdf1..f027791f55 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-21  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.cp/expand-psymtabs-cxx.exp: New file.
+	* gdb.cp/expand-psymtabs-cxx.cc: New file.
+
 2011-10-20  Phil Muldoon  <pmuldoon@redhat.com>
 
 	PR python/12656
diff --git a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.cc b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.cc
new file mode 100644
index 0000000000..f6642edb6a
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.cc
@@ -0,0 +1,21 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2011 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+void
+method (long x)
+{
+}
diff --git a/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp
new file mode 100644
index 0000000000..94adf5016d
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/expand-psymtabs-cxx.exp
@@ -0,0 +1,37 @@
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# This file is part of the gdb testsuite.
+
+set testfile expand-psymtabs-cxx
+set srcfile ${testfile}.cc
+set executable ${testfile}.x
+set binfile ${objdir}/${subdir}/${executable}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug c++} ] != "" } {
+     untested ${testfile}.exp
+     return -1
+}
+
+clean_restart ${executable}
+
+gdb_test_no_output "set language c++"
+
+# FAIL was:
+# $1 = {<text variable, no debug info>} 0
+gdb_test "p 'method(long)'" { = {void \(long\)} 0} "before expand"
+gdb_test "p method" { = {void \(long\)} 0} "force expand"
+gdb_test "p 'method(long)'" { = {void \(long\)} 0} "after expand"