diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py
index fcd5ded..c15c844 100644
--- a/tests/test_pagure_flask_ui_app.py
+++ b/tests/test_pagure_flask_ui_app.py
@@ -161,23 +161,24 @@ class PagureFlaskApptests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             self.assertIn('<strong>Create new Project</strong>', output.data)
             self.assertIn(
-                '<small>\n                      This field is required.'
-                '&nbsp;\n                    </small>', output.data)
+                '<small>\n            This field is required.&nbsp;\n'
+                '          </small>', output.data)
 
             data['name'] = 'project-1'
             output = self.app.post('/new/', data=data)
             self.assertEqual(output.status_code, 200)
             self.assertIn('<strong>Create new Project</strong>', output.data)
             self.assertNotIn(
-                '<small>\n                      This field is required.'
-                '&nbsp;\n                    </small>', output.data)
+                '<small>\n            This field is required.&nbsp;\n'
+                '          </small>', output.data)
 
             data['csrf_token'] =  csrf_token
             output = self.app.post('/new/', data=data)
             self.assertEqual(output.status_code, 200)
             self.assertIn('<strong>Create new Project</strong>', output.data)
             self.assertIn(
-                '</button>\n                      No user &#34;username&#34; found',
+                '</button>\n                      No user '
+                '&#34;username&#34; found\n                    </div>',
                 output.data)
 
         user.username = 'foo'
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index e093181..fab24c2 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -1163,11 +1163,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '<div class="card-header">\n        Edit '
                 'issue #1\n      </div>' in output.data)
             self.assertEqual(output.data.count(
-                '<small>\n                      This field is required'
-                '.&nbsp;\n                    </small>'), 1)
+                '<small>\n            This field is required.&nbsp;\n'
+                '          </small>'), 1)
             self.assertEqual(output.data.count(
-                '<small>\n                      Not a valid choice'
-                '&nbsp;\n                    </small>'), 1)
+                '<small>\n            Not a valid choice&nbsp;'
+                '\n          </small>'), 1)
 
             data['status'] = 'Open'
             data['title'] = 'Test issue #1'
@@ -1177,11 +1177,11 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '<div class="card-header">\n        Edit '
                 'issue #1\n      </div>' in output.data)
             self.assertEqual(output.data.count(
-                '<small>\n                      This field is required'
-                '.&nbsp;\n                    </small>'), 0)
+                '<small>\n            This field is required.&nbsp;\n'
+                '          </small>'), 0)
             self.assertEqual(output.data.count(
-                '<small>\n                      Not a valid choice'
-                '.&nbsp;\n                    </small>'), 0)
+                '<small>\n            Not a valid choice&nbsp;'
+                '\n          </small>'), 0)
 
             data['csrf_token'] = csrf_token
             output = self.app.post(