diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2228dc57b4..18faac39e0 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-19  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.base/maint.exp: Make the test to command 'maint dump-me'
+	unsupported if it is not registered.
+
 2013-06-18  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.base/random-signal.c: New file.
diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp
index 260818e638..afc321f188 100644
--- a/gdb/testsuite/gdb.base/maint.exp
+++ b/gdb/testsuite/gdb.base/maint.exp
@@ -506,6 +506,10 @@ gdb_test_multiple "maint dump-me" "maint dump-me" {
     -re "Should GDB dump core.*\\(y or n\\) $" {
 	gdb_test "n" ".*" "maint dump-me"
     }
+    -re "Undefined maintenance command: .*$gdb_prompt $" {
+	# Command 'maint dump-me' is registered on non-win32 host.
+	unsupported "maint dump-me"
+    }
 }
 
 send_gdb "maint internal-error\n"