diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 22eaae013ab..a75108b1e97 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-16  Carlos Eduardo Seo  <cseo@linux.vnet.ibm.com>
+	    Jim Blandy  <jimb@codesourcery.com>
+
+	* gdb.base/expand-psymtabs.c: New testcase
+	source file.
+	* gdb.base/expand-psymtabs.exp: New testcase
+	expect file.
+
+
 2007-12-17  Luis Machado  <luisgpm@br.ibm.com>
 
 	* testsuite/gdb.base/watch_thread_num.c: New testcase source file.
diff --git a/gdb/testsuite/gdb.base/expand-psymtabs.c b/gdb/testsuite/gdb.base/expand-psymtabs.c
new file mode 100644
index 00000000000..06ec92975fe
--- /dev/null
+++ b/gdb/testsuite/gdb.base/expand-psymtabs.c
@@ -0,0 +1,35 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2007 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/>.  */
+
+extern void foo (void);
+
+#ifdef FIRST
+int
+main (void)
+  {
+    foo ();
+    return 0;
+  }
+
+#else
+void
+foo (void)
+  {
+    /* Break here  */
+  }
+
+#endif
diff --git a/gdb/testsuite/gdb.base/expand-psymtabs.exp b/gdb/testsuite/gdb.base/expand-psymtabs.exp
new file mode 100644
index 00000000000..77af7c9bb88
--- /dev/null
+++ b/gdb/testsuite/gdb.base/expand-psymtabs.exp
@@ -0,0 +1,58 @@
+# Copyright 2007 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.
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+# Test expanding partial symtabs when needed.
+
+set testfile expand-psymtabs
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/${testfile}
+set binfile_1 ${objdir}/${subdir}/${testfile}_1.o
+set binfile_2 ${objdir}/${subdir}/${testfile}_2.o
+
+# What compiler are we using?
+if [get_compiler_info ${binfile}] {
+    return -1
+}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_1}" object {debug additional_flags=-DFIRST} ] != "" } {
+     untested expand-psymtabs.exp
+     return -1
+}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_2}" object {debug}] != "" } {
+     untested expand-psymtabs.exp
+     return -1
+}
+
+if  { [gdb_compile "${binfile_1} ${binfile_2}" "${binfile}" executable {debug}] != "" } {
+     untested expand-psymtabs.exp
+     return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+set foo_bp [gdb_get_line_number "Break here"]
+gdb_test "break $foo_bp" "Breakpoint.*" "Expand psymtabs"
+