diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index 4664c92..9dab4e9 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -504,8 +504,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output.data)
             self.assertTrue(
                 '<p>Woohoo a second comment !</p>' in output.data)
-            self.assertEqual(
-                output.data.count('<div class="comment_body">'), 2)
+            self.assertEqual(output.data.count('comment_body">'), 2)
             self.assertTrue(
                 '<option selected value="Fixed">Fixed</option>'
                 in output.data)
@@ -532,8 +531,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output.data)
             self.assertTrue(
                 '<p>Woohoo a second comment !</p>' in output.data)
-            self.assertEqual(
-                output.data.count('<div class="comment_body">'), 2)
+            self.assertEqual(output.data.count('comment_body">'), 2)
             self.assertTrue(
                 '<option selected value="Fixed">Fixed</option>'
                 in output.data)
@@ -557,8 +555,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output.data)
             self.assertTrue(
                 '<p>Woohoo a second comment !</p>' in output.data)
-            self.assertEqual(
-                output.data.count('<div class="comment_body">'), 2)
+            self.assertEqual(output.data.count('comment_body">'), 2)
             self.assertTrue(
                 '<option selected value="Fixed">Fixed</option>'
                 in output.data)
@@ -584,8 +581,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '<a href="/test/issues?assignee=pingou">' in output.data)
             self.assertTrue(
                 '<p>Woohoo a second comment !</p>' in output.data)
-            self.assertEqual(
-                output.data.count('<div class="comment_body">'), 2)
+            self.assertEqual(output.data.count('comment_body">'), 2)
             self.assertTrue(
                 '<option selected value="Fixed">Fixed</option>'
                 in output.data)
@@ -722,8 +718,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output.data)
             self.assertTrue(
                 '<p>Woohoo a second comment !</p>' in output.data)
-            self.assertEqual(
-                output.data.count('<div class="comment_body">'), 2)
+            self.assertEqual(output.data.count('comment_body">'), 2)
 
         repo = pagure.lib.get_project(self.session, 'test')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
@@ -1205,9 +1200,9 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output.data)
             self.assertEqual(output.data.count(
                 '<option selected value="Open">Open</option>'), 1)
+            self.assertEqual(output.data.count('comment_body">'), 1)
             self.assertEqual(output.data.count(
-                '<div class="comment_body">\n'
-                '        <p>We should work on this!</p>'), 1)
+                '<p>We should work on this!</p>'), 1)
 
         # Project w/o issue tracker
         repo = pagure.lib.get_project(self.session, 'test')
@@ -1516,8 +1511,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output.data)
             self.assertTrue(
                 '<p>Woohoo a second comment !</p>' in output.data)
-            self.assertEqual(
-                output.data.count('<div class="comment_body">'), 2)
+            self.assertEqual(output.data.count('comment_body">'), 2)
 
         repo = pagure.lib.get_project(self.session, 'test')
         issue = pagure.lib.search_issues(self.session, repo, issueid=1)
diff --git a/tests/test_pagure_flask_ui_no_master_branch.py b/tests/test_pagure_flask_ui_no_master_branch.py
index bbbc943..efcdd4f 100644
--- a/tests/test_pagure_flask_ui_no_master_branch.py
+++ b/tests/test_pagure_flask_ui_no_master_branch.py
@@ -186,7 +186,7 @@ class PagureFlaskNoMasterBranchtests(tests.Modeltests):
         output = self.app.get('/test/commits')
         self.assertEqual(output.status_code, 200)
         self.assertIn(
-            '<div class="list-group m-t-1">\n        </div>', output.data)
+            '<div class="list-group m-t-1">\n      </div>', output.data)
         self.assertNotIn(
             '<div class="btn-group pull-xs-right">', output.data)
 
@@ -198,7 +198,7 @@ class PagureFlaskNoMasterBranchtests(tests.Modeltests):
         self.assertIn('Add sources file for testing', output.data)
         self.assertIn('Add .gitignore file for testing', output.data)
         self.assertNotIn(
-            '<div class="list-group m-t-1">\n        </div>', output.data)
+            '<div class="list-group m-t-1">\n      </div>', output.data)
         self.assertEqual(
             output.data.count('class="list-group-item p-l-3"'), 2)