diff --git a/mysql-test/r/xml.result b/mysql-test/r/xml.result
index 4d66e034964..b4121ae473d 100644
--- a/mysql-test/r/xml.result
+++ b/mysql-test/r/xml.result
@@ -542,3 +542,5 @@ a
 select extractvalue('<a>a<b>B</b></a>','a|/b');
 extractvalue('<a>a<b>B</b></a>','a|/b')
 a
+select extractvalue('<a>A</a>','/<a>');
+ERROR HY000: XPATH syntax error: '>'
diff --git a/mysql-test/t/xml.test b/mysql-test/t/xml.test
index e88d95674ed..0e24692f0fa 100644
--- a/mysql-test/t/xml.test
+++ b/mysql-test/t/xml.test
@@ -231,3 +231,9 @@ select extractvalue('<a><b>B</b></a>','/a|b');
 select extractvalue('<a>a<b>B</b></a>','/a|/b');
 select extractvalue('<a>a<b>B</b></a>','/a|b');
 select extractvalue('<a>a<b>B</b></a>','a|/b');
+
+#
+# Bug#16312 XML: extractvalue() crash if angle brackets
+#
+--error 1105
+select extractvalue('<a>A</a>','/<a>');