diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3aa68e3847f..bcaf8bb5b0f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-18  Joel Brobecker  <brobecker@adacore.com>
+
+	* mi-language.exp: Add "-list-features" test verifying that
+	its output contains "language-option".
+
 2013-11-16  Joel Brobecker  <brobecker@adacore.com>
 
 	* info_exc/const.ads (Aint_Global_GDB_E): Renames Aint_Global_E.
diff --git a/gdb/testsuite/gdb.mi/mi-language.exp b/gdb/testsuite/gdb.mi/mi-language.exp
index 550beec5e46..0b77b01f156 100644
--- a/gdb/testsuite/gdb.mi/mi-language.exp
+++ b/gdb/testsuite/gdb.mi/mi-language.exp
@@ -21,6 +21,12 @@ if [mi_gdb_start] {
     continue
 }
 
+# First, verify that the debugger correctly advertises support
+# for the --language option.
+mi_gdb_test "-list-features" \
+            "\\^done,features=\\\[.*\"language-option\".*\\\]" \
+            "-list-features should include \"language-option\""
+
 mi_gdb_test "set lang ada" \
             ".*=cmd-param-changed,param=\"language\",value=\"ada\".*" \
             "set lang ada"