diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index dfdc5db..385a9ab 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -555,7 +555,9 @@ def view_file(repo, identifier, filename, username=None, namespace=None):
         elif ext in ('.rst', '.mk', '.md', '.markdown') and not rawtext:
             content, safe = pagure.doc_utils.convert_readme(content.data, ext)
             output_type = 'markup'
-        elif 'data' in dir(content) and len(content.data) < HUGEFILE and not isbinary:
+        elif 'data' in dir(content) \
+                and len(content.data) < HUGEFILE \
+                and not isbinary:
             file_content = None
             try:
                 file_content = encoding_utils.decode(
@@ -616,7 +618,8 @@ def view_file(repo, identifier, filename, username=None, namespace=None):
     if output_type == 'binary':
         headers['Content-Disposition'] = 'attachment'
 
-    return flask.Response(flask.stream_with_context(stream_template(
+    return flask.Response(flask.stream_with_context(
+        stream_template(
             flask.current_app,
             'file.html',
             select='tree',
diff --git a/tests/test_pagure_flask_form.py b/tests/test_pagure_flask_form.py
index 5778bd3..a45a7a9 100644
--- a/tests/test_pagure_flask_form.py
+++ b/tests/test_pagure_flask_form.py
@@ -19,7 +19,7 @@ import os
 
 import flask
 import flask_wtf
-from mock import patch
+from mock import patch, MagicMock
 
 sys.path.insert(0, os.path.join(os.path.dirname(
     os.path.abspath(__file__)), '..'))
@@ -38,12 +38,14 @@ class PagureFlaskFormTests(tests.SimplePagureTest):
     def test_csrf_form_no_input(self):
         """ Test the CSRF validation if not CSRF is specified. """
         with self.app.application.test_request_context(method='POST'):
+            flask.g.session = MagicMock()
             form = pagure.forms.ConfirmationForm()
             self.assertFalse(form.validate_on_submit())
 
     def test_csrf_form_w_invalid_input(self):
         """ Test the CSRF validation with an invalid CSRF specified. """
         with self.app.application.test_request_context(method='POST'):
+            flask.g.session = MagicMock()
             form = pagure.forms.ConfirmationForm()
             form.csrf_token.data = 'foobar'
             self.assertFalse(form.validate_on_submit())
@@ -51,6 +53,7 @@ class PagureFlaskFormTests(tests.SimplePagureTest):
     def test_csrf_form_w_input(self):
         """ Test the CSRF validation with a valid CSRF specified. """
         with self.app.application.test_request_context(method='POST'):
+            flask.g.session = MagicMock()
             form = pagure.forms.ConfirmationForm()
             form.csrf_token.data = form.csrf_token.current_token
             self.assertTrue(form.validate_on_submit())
@@ -58,6 +61,7 @@ class PagureFlaskFormTests(tests.SimplePagureTest):
     def test_csrf_form_w_expired_input(self):
         """ Test the CSRF validation with an expired CSRF specified. """
         with self.app.application.test_request_context(method='POST'):
+            flask.g.session = MagicMock()
             form = pagure.forms.ConfirmationForm()
             data = form.csrf_token.current_token
 
@@ -90,6 +94,7 @@ class PagureFlaskFormTests(tests.SimplePagureTest):
         """ Test the CSRF validation with a CSRF not expiring. """
         pagure.config.config['WTF_CSRF_TIME_LIMIT'] = None
         with self.app.application.test_request_context(method='POST'):
+            flask.g.session = MagicMock()
             form = pagure.forms.ConfirmationForm()
             data = form.csrf_token.current_token
 
@@ -106,6 +111,7 @@ class PagureFlaskFormTests(tests.SimplePagureTest):
     def test_add_user_form(self):
         """ Test the AddUserForm of pagure.forms """
         with self.app.application.test_request_context(method='POST'):
+            flask.g.session = MagicMock()
             form = pagure.forms.AddUserForm()
             form.csrf_token.data = form.csrf_token.current_token
             # No user or access given
@@ -119,6 +125,7 @@ class PagureFlaskFormTests(tests.SimplePagureTest):
     def test_add_user_to_group_form(self):
         """ Test the AddUserToGroup form of pagure.forms """
         with self.app.application.test_request_context(method='POST'):
+            flask.g.session = MagicMock()
             form = pagure.forms.AddUserToGroupForm()
             form.csrf_token.data = form.csrf_token.current_token
             # No user given
@@ -130,6 +137,7 @@ class PagureFlaskFormTests(tests.SimplePagureTest):
     def test_add_group_form(self):
         """ Test the AddGroupForm form of pagure.forms """
         with self.app.application.test_request_context(method='POST'):
+            flask.g.session = MagicMock()
             form = pagure.forms.AddGroupForm()
             form.csrf_token.data = form.csrf_token.current_token
             # No group given