diff --git a/pelican/tests/test_utils.py b/pelican/tests/test_utils.py
index 1890ffb96..2dab2ab44 100644
--- a/pelican/tests/test_utils.py
+++ b/pelican/tests/test_utils.py
@@ -259,6 +259,26 @@ def test_truncate_html_words(self):
             utils.truncate_html_words('<!-- comment -->' + 'word ' * 100, 20),
             '<!-- comment -->' + 'word ' * 20 + '…')
 
+        # Words enclosed or intervaled by HTML tags with a custom end
+        # marker containing HTML tags.
+        self.assertEqual(
+            utils.truncate_html_words('<p>' + 'word ' * 100 + '</p>', 20,
+                                      '<span>marker</span>'),
+            '<p>' + 'word ' * 20 + '<span>marker</span></p>')
+        self.assertEqual(
+            utils.truncate_html_words(
+                    '<span\nstyle="\n…\n">' + 'word ' * 100 + '</span>', 20,
+                    '<span>marker</span>'),
+            '<span\nstyle="\n…\n">' + 'word ' * 20 + '<span>marker</span></span>')
+        self.assertEqual(
+            utils.truncate_html_words('<br>' + 'word ' * 100, 20,
+                                      '<span>marker</span>'),
+            '<br>' + 'word ' * 20 + '<span>marker</span>')
+        self.assertEqual(
+            utils.truncate_html_words('<!-- comment -->' + 'word ' * 100, 20,
+                                      '<span>marker</span>'),
+            '<!-- comment -->' + 'word ' * 20 + '<span>marker</span>')
+
         # Words with hypens and apostrophes.
         self.assertEqual(
             utils.truncate_html_words("a-b " * 100, 20),