diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 84ad6d61051..8d52bb9fc6b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-15  Yao Qi  <yao.qi@linaro.org>
+
+	* gdb.gdb/unittest.exp: Skip 'maintenance check xml-descriptions'
+	if XML is disabled.
+
 2017-12-15  Xavier Roirand  <roirand@adacore.com>
 
 	* gdb.ada/same_component_name: New testcase.
diff --git a/gdb/testsuite/gdb.gdb/unittest.exp b/gdb/testsuite/gdb.gdb/unittest.exp
index 58494e169c5..7d280d14638 100644
--- a/gdb/testsuite/gdb.gdb/unittest.exp
+++ b/gdb/testsuite/gdb.gdb/unittest.exp
@@ -13,10 +13,12 @@
 # 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 do_xml_test [expr ![gdb_skip_xml_test]]
+
 gdb_start
 gdb_test "maintenance selftest" "Ran $decimal unit tests, 0 failed"
 
-if { ![is_remote host] } {
+if { ![is_remote host] && $do_xml_test } {
     gdb_test "maintenance check xml-descriptions ${srcdir}/../features" \
 	"Tested $decimal XML files, 0 failed" \
 	"maintenance check xml-descriptions \${srcdir}/../features"