diff --git a/openlp/plugins/songs/lib/openlyricsxml.py b/openlp/plugins/songs/lib/openlyricsxml.py
index 5adffb300..e2964661d 100644
--- a/openlp/plugins/songs/lib/openlyricsxml.py
+++ b/openlp/plugins/songs/lib/openlyricsxml.py
@@ -458,7 +458,7 @@ class OpenLyrics(object):
                 self._add_tag_to_formatting(tag, tags_element)
         # Replace end tags.
         for tag in end_tags:
-            text = text.replace('{/{tag}}}'.format(tag=tag), '</tag>')
+            text = text.replace('{{{tag}}}'.format(tag=tag), '</tag>')
         # Replace \n with <br/>.
         text = text.replace('\n', '<br/>')
         element = etree.XML('<lines>{text}</lines>'.format(text=text))
@@ -643,7 +643,7 @@ class OpenLyrics(object):
         # Append text from tail and add formatting end tag.
         # TODO: Verify format() with template variables
         if element.tag == NSMAP % 'tag' and use_endtag:
-            text += '{/{name}}}'.format(name=element.get('name'))
+            text += '{{{name}}}'.format(name=element.get('name'))
         # Append text from tail.
         if element.tail:
             text += element.tail
diff --git a/tests/utils/test_pylint.py b/tests/utils/test_pylint.py
index dc6c83909..1675a41ee 100644
--- a/tests/utils/test_pylint.py
+++ b/tests/utils/test_pylint.py
@@ -48,7 +48,7 @@ class TestPylint(TestCase):
         """
         # GIVEN: Some checks to disable and enable, and the pylint script
         disabled_checks = 'import-error,no-member'
-        enabled_checks = 'missing-format-argument-key,unused-format-string-argument'
+        enabled_checks = 'missing-format-argument-key,unused-format-string-argument,bad-format-string'
         if is_win() or 'arch' in platform.dist()[0].lower():
             pylint_script = 'pylint'
         else: