diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py
--- a/Lib/test/test_htmlparser.py
+++ b/Lib/test/test_htmlparser.py
@@ -348,6 +348,18 @@
                 ("starttag", "html", [("foo", u"\u20AC&aa&unsupported;")])
                 ])
 
+    def test_with_entity_and_non_ascii_in_attribute_value(self):
+        self._run_check('<a name="\xe4 and &quot;">\xe4 and &quot;</a>',
+                        [('starttag', 'a', [('name', '\xe4 and "')]),
+                         ('data', '\xe4 and '), ('entityref', 'quot'),
+                         ('endtag', 'a')])
+
+    def test_with_tag_and_non_ascii_in_attribute_value(self):
+        self._run_check(u'<a href="8999.html" title="<br>pa\xeds">',
+                        [('starttag', 'a',
+                            [('href', '8999.html'), ('title', u'<br>pa\xeds')])])
+
+
     def test_malformatted_charref(self):
         self._run_check("<p>&#bad;</p>", [
             ("starttag", "p", []),