diff --git a/tests/test_progit_flask_ui_fork.py b/tests/test_progit_flask_ui_fork.py
index d76c97a..d5f153e 100644
--- a/tests/test_progit_flask_ui_fork.py
+++ b/tests/test_progit_flask_ui_fork.py
@@ -319,7 +319,7 @@ class PagureFlaskForktests(tests.Modeltests):
                 'Pagure</title>', output.data)
             self.assertIn(
                 '<h2><span class="label label-default">PR#1</span> '
-                'PR from the feature branch<a class="edit_icon"', output.data)
+                'PR from the feature branch<small>', output.data)
             self.assertIn(
                 '</button>\n                      This request must be '
                 'assigned to be merged', output.data)
@@ -336,7 +336,7 @@ class PagureFlaskForktests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             self.assertIn(
                 '<h2><span class="label label-default">PR#1</span> '
-                'PR from the feature branch<a class="edit_icon', output.data)
+                'PR from the feature branch<small>', output.data)
             self.assertIn(
                 '</button>\n                      Only the assignee can '
                 'merge this review', output.data)
@@ -353,7 +353,7 @@ class PagureFlaskForktests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             self.assertIn(
                 '<h2><span class="label label-default">PR#1</span> '
-                'PR from the feature branch<a class="edit_icon', output.data)
+                'PR from the feature branch<small>', output.data)
             self.assertIn(
                 '</button>\n                      This request does not '
                 'have the minimum review score necessary to be merged',
@@ -437,7 +437,7 @@ class PagureFlaskForktests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             self.assertIn(
                 '<h2><span class="label label-default">PR#1</span> '
-                'PR from the feature branch<a class="edit_icon"', output.data)
+                'PR from the feature branch<small>', output.data)
             self.assertIn(
                 '</button>\n                      Merge conflicts!',
                 output.data)
@@ -490,7 +490,7 @@ class PagureFlaskForktests(tests.Modeltests):
             '<h2><span class="label label-default">PR#1</span> '
             'PR from the feature branch</h2>', output.data)
         self.assertIn(
-            '<span>Merged by', output.data)
+            '<span class="btn btn-default">Merged by', output.data)
         self.assertIn(
             'title="View file as of 2a552b">View</a>', output.data)
 
@@ -1433,7 +1433,7 @@ index 0000000..2a552bb
             output = self.app.post('/test/pull-request/1/comment')
             self.assertEqual(output.status_code, 200)
             self.assertTrue(
-                output.data.startswith('<section class="add_comment">'))
+                output.data.startswith('\n<section class="add_comment">'))
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -1528,7 +1528,7 @@ index 0000000..2a552bb
             self.assertEqual(output.status_code, 200)
             self.assertIn(
                 '<h2><span class="label label-default">PR#1</span> '
-                'PR from the feature branch<a class="edit_icon"', output.data)
+                'PR from the feature branch<small>', output.data)
             self.assertIn(
                 '</button>\n                      Comment removed',
                 output.data)
@@ -1568,7 +1568,7 @@ index 0000000..2a552bb
             self.assertEqual(output.status_code, 200)
             # Creating comment to play with
             self.assertTrue(
-                output.data.startswith('<section class="add_comment">'))
+                output.data.startswith('\n<section class="add_comment">'))
 
             csrf_token = output.data.split(
                 'name="csrf_token" type="hidden" value="')[1].split('">')[0]
@@ -1584,8 +1584,7 @@ index 0000000..2a552bb
 
             self.assertIn(
                 '<h2><span class="label label-default">PR#1</span> '
-                'PR from the feature branch<a class="edit_icon"',
-                output.data)
+                'PR from the feature branch<small>', output.data)
             self.assertIn(
                 '</button>\n                      Comment added',
                 output.data)
@@ -1615,7 +1614,7 @@ index 0000000..2a552bb
                 '<p>This look alright but we can do better than this.</p>', output.data)
             self.assertIn(
                 '<h2><span class="label label-default">PR#1</span> '
-                'PR from the feature branch<a class="edit_icon"', output.data)
+                'PR from the feature branch<small>', output.data)
             # Checking if Edited by User is there or not
             self.assertIn(
                 '<small class="text-muted">Edited just now by pingou </small>',
diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py
index 952420d..ca42902 100644
--- a/tests/test_progit_flask_ui_issues.py
+++ b/tests/test_progit_flask_ui_issues.py
@@ -1162,7 +1162,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output.data)
             self.assertIn(
                 '<span class="issueid label label-default">#1</span>\n'
-                '      <span id="issuetitle">Test issue #1</span>',
+                '    <span id="issuetitle">Test issue #1</span>',
                 output.data)
             self.assertEqual(output.data.count(
                 '<option selected value="Open">Open</option>'), 1)
diff --git a/tests/test_progit_flask_ui_no_master_branch.py b/tests/test_progit_flask_ui_no_master_branch.py
index 5cf88a5..ee7d194 100644
--- a/tests/test_progit_flask_ui_no_master_branch.py
+++ b/tests/test_progit_flask_ui_no_master_branch.py
@@ -310,7 +310,8 @@ class PagureFlaskNoMasterBranchtests(tests.Modeltests):
         tests.create_projects(self.session)
         # Non-existant git repo
         output = self.app.get('/test/diff/master..feature')
-        self.assertEqual(output.status_code, 302)
+        # (used to be 302 but seeing a diff is allowed even logged out)
+        self.assertEqual(output.status_code, 404)
 
         user = tests.FakeUser()
         with tests.user_set(pagure.APP, user):
@@ -320,7 +321,11 @@ class PagureFlaskNoMasterBranchtests(tests.Modeltests):
         self.set_up_git_repo()
 
         output = self.app.get('/test/diff/master..feature')
-        self.assertEqual(output.status_code, 302)
+        # (used to be 302 but seeing a diff is allowed even logged out)
+        self.assertEqual(output.status_code, 400)
+        self.assertIn(
+            '<p>Branch master could not be found in the target repo</p>',
+            output.data)
 
         user = tests.FakeUser()
         with tests.user_set(pagure.APP, user):
diff --git a/tests/test_progit_flask_ui_slash_branch_name.py b/tests/test_progit_flask_ui_slash_branch_name.py
index 9e53717..38743c7 100644
--- a/tests/test_progit_flask_ui_slash_branch_name.py
+++ b/tests/test_progit_flask_ui_slash_branch_name.py
@@ -339,7 +339,8 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
         tests.create_projects(self.session)
         # Non-existant git repo
         output = self.app.get('/test/diff/master..maxamilion/feature')
-        self.assertEqual(output.status_code, 302)
+        # (used to be 302 but seeing a diff is allowed even logged out)
+        self.assertEqual(output.status_code, 404)
 
         user = tests.FakeUser()
         with tests.user_set(pagure.APP, user):
@@ -349,7 +350,10 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
         self.set_up_git_repo()
 
         output = self.app.get('/test/diff/master..maxamilion/feature')
-        self.assertEqual(output.status_code, 302)
+        # (used to be 302 but seeing a diff is allowed even logged out)
+        self.assertEqual(output.status_code, 200)
+        self.assertEqual(output.data.count('<td class="commitid">'), 1)
+        self.assertIn('<h5>.gitignore', output.data)
 
         user = tests.FakeUser()
         with tests.user_set(pagure.APP, user):
@@ -357,7 +361,7 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             self.assertEqual(
                 output.data.count('<td class="commitid">'), 1)
-            self.assertIn('<h3>.gitignore</h3>', output.data)
+            self.assertIn('<h5>.gitignore', output.data)
 
 
 if __name__ == '__main__':