diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5ec3cf4d5f..f6f51212de 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-14  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.base/wchar.c, gdb.base/wchar.exp: New testcases.
+
 2011-01-14  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.ada/widewide: New testcase.
diff --git a/gdb/testsuite/gdb.base/wchar.c b/gdb/testsuite/gdb.base/wchar.c
new file mode 100644
index 0000000000..9eaf7666d5
--- /dev/null
+++ b/gdb/testsuite/gdb.base/wchar.c
@@ -0,0 +1,40 @@
+/* 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/>.  */
+
+#include <wchar.h>
+
+void
+do_nothing (wchar_t *c)
+{
+}
+
+int
+main (void)
+{
+  wchar_t narrow = 97;
+  wchar_t single = 0xbeef;
+  wchar_t simple[] = L"facile";
+  wchar_t difficile[] = { 0xdead, 0xbeef, 0xfeed, 0xface};
+  wchar_t mixed[] = {L'f', 0xdead, L'a', L'c', 0xfeed, 0xface};
+
+  do_nothing (&narrow); /* START */
+  do_nothing (&single);
+  do_nothing (simple);
+  do_nothing (difficile);
+  do_nothing (mixed);
+}
+
diff --git a/gdb/testsuite/gdb.base/wchar.exp b/gdb/testsuite/gdb.base/wchar.exp
new file mode 100644
index 0000000000..f3e09f2cab
--- /dev/null
+++ b/gdb/testsuite/gdb.base/wchar.exp
@@ -0,0 +1,38 @@
+# 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/>.
+
+set testfile wchar
+set srcfile ${testfile}.c
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
+    return -1
+}
+
+set bp_location [gdb_get_line_number "START"]
+if ![runto "wchar.c:$bp_location" ] then {
+  return -1
+}
+
+gdb_test "print narrow" "= 97 L'a'"
+
+gdb_test "print single" "= 48879 L'\\\\xbeef'"
+
+gdb_test "print simple" "= L\"facile\""
+
+gdb_test "print difficile" "= L\"\\\\xdead\\\\xbeef\\\\xfeed\\\\xface\""
+
+gdb_test "print simple\[2\]" "= 99 L'c'"
+
+gdb_test "print difficile\[2\]" "= 65261 L'\\\\xfeed'"
+