diff --git a/tests/__init__.py b/tests/__init__.py
index 521316b..b0d21ad 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -312,10 +312,11 @@ class Modeltests(unittest.TestCase):
         shutil.rmtree(self.path)
         self.path = None
 
-    def get_csrf(self, url='/new'):
+    def get_csrf(self, url='/new', output=None):
         """Retrieve a CSRF token from given URL."""
-        output = self.app.get(url)
-        self.assertEqual(output.status_code, 200)
+        if output is None:
+            output = self.app.get(url)
+            self.assertEqual(output.status_code, 200)
 
         return output.data.split(
             'name="csrf_token" type="hidden" value="')[1].split('">')[0]
diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py
index fd631df..66ce171 100644
--- a/tests/test_pagure_flask_ui_fork.py
+++ b/tests/test_pagure_flask_ui_fork.py
@@ -293,8 +293,7 @@ class PagureFlaskForktests(tests.Modeltests):
             output = self.app.get('/test/pull-request/1')
             self.assertEqual(output.status_code, 200)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             # No CSRF
             output = self.app.post(
@@ -454,8 +453,7 @@ class PagureFlaskForktests(tests.Modeltests):
             output = self.app.get('/test/pull-request/1')
             self.assertEqual(output.status_code, 200)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'csrf_token': csrf_token,
@@ -491,8 +489,7 @@ class PagureFlaskForktests(tests.Modeltests):
             output = self.app.get('/test/pull-request/1')
             self.assertEqual(output.status_code, 200)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'csrf_token': csrf_token,
@@ -525,8 +522,7 @@ class PagureFlaskForktests(tests.Modeltests):
             output = self.app.get('/test/pull-request/1')
             self.assertEqual(output.status_code, 200)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'csrf_token': csrf_token,
@@ -1132,8 +1128,7 @@ index 0000000..2a552bb
             output = self.app.get('/test/pull-request/1')
             self.assertEqual(output.status_code, 200)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'csrf_token': csrf_token,
@@ -1227,8 +1222,7 @@ index 0000000..2a552bb
             output = self.app.get('/test/pull-request/1')
             self.assertEqual(output.status_code, 200)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'user': 'pingou',
@@ -1344,8 +1338,7 @@ index 0000000..2a552bb
             self.assertEqual(output.status_code, 200)
             self.assertIn('<strong>Create new Project</strong>', output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'csrf_token': csrf_token,
@@ -1424,8 +1417,7 @@ index 0000000..2a552bb
                 '<input type="submit" class="btn btn-primary" value="Create">',
                 output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             # Case 1 - Add an initial comment
             data = {
@@ -1492,8 +1484,7 @@ index 0000000..2a552bb
                 '<input type="submit" class="btn btn-primary" value="Create">',
                 output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             # Case 1 - Add an initial comment
             data = {
@@ -1550,8 +1541,7 @@ index 0000000..2a552bb
                 'pull request with</p>', output.data)
 
             output = self.app.get('/test/new_issue')
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'csrf_token': csrf_token,
@@ -1623,8 +1613,7 @@ index 0000000..2a552bb
             self.assertTrue(
                 output.data.startswith('\n<section class="add_comment">'))
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'csrf_token': csrf_token,
@@ -1688,8 +1677,7 @@ index 0000000..2a552bb
                 '<p>This look alright but we can do better</p>',
                 output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             # Invalid comment id
             data = {
@@ -1759,8 +1747,7 @@ index 0000000..2a552bb
             self.assertTrue(
                 output.data.startswith('\n<section class="add_comment">'))
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'csrf_token': csrf_token,
@@ -1789,8 +1776,7 @@ index 0000000..2a552bb
             self.assertIn(
                 'This look alright but we can do better</textarea>', output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'csrf_token': csrf_token,
@@ -1843,8 +1829,7 @@ index 0000000..2a552bb
             output = self.app.get('/test/pull-request/1')
             self.assertEqual(output.status_code, 200)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             # No CSRF
             output = self.app.post(
@@ -2078,8 +2063,7 @@ index 0000000..2a552bb
             self.assertEqual(output.status_code, 200)
             self.assertIn('<strong>Create new Project</strong>', output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'csrf_token': csrf_token,
@@ -2131,6 +2115,7 @@ index 0000000..2a552bb
             # Check for edit panel
             output = self.app.post('fork_edit/test/edit/master/f/sources',
                             data=data, follow_redirects=True)
+            print output.data
             self.assertEqual(output.status_code, 200)
             self.assertIn(
                 '<li><a href="/fork/foo/test/tree/master">'
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index 4484931..33ef494 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -76,8 +76,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '<div class="card-header">\n        New issue'
                 in output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
             }
@@ -703,8 +702,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 output.data)
             self.assertIn('title="Delete this ticket">', output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
         # Create private issue
         repo = pagure.get_authorized_project(self.session, 'test')
@@ -1126,8 +1124,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 'href="/test/issue/1/edit" title="Edit this issue">',
                 output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'status': 'Closed',
@@ -1433,8 +1430,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 'href="/test/issue/1/edit" title="Edit this issue">',
                 output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             # Add new comment
             data = {
@@ -1555,8 +1551,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 'href="/test/issue/1/edit" title="Edit this issue">',
                 output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             # Add a dependent ticket
             data = {
@@ -1644,8 +1639,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '<title>Issue #1: Test issue - test - Pagure</title>',
                 output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             # Add a dependent ticket
             data = {
@@ -1677,8 +1671,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 'href="/test/issue/1/edit" title="Edit this issue">',
                 output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             # Add a dependent ticket
             data = {
@@ -1760,8 +1753,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 'href="/test/issue/1/edit" title="Edit this issue">',
                 output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             output = self.app.post('/foo/issue/1/upload')
             self.assertEqual(output.status_code, 404)
@@ -2066,8 +2058,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '<div class="card-header">\n        Edit '
                 'issue #1\n      </div>' in output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
                 'issue_content': 'We should work on this!'
@@ -2189,8 +2180,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             self.assertTrue('<strong>Edit tag: tag1</strong>' in output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {'tag': 'tag2',
                     'tag_description': 'lorem ipsum',
@@ -2291,8 +2281,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '<title>Settings - test - Pagure</title>' in output.data)
             self.assertTrue("<h3>Settings for test</h3>" in output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {'tag': 'tag1'}
 
@@ -2357,8 +2346,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '<title>Issue #1: Test issue - test - Pagure</title>',
                 output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data = {
             }
@@ -2429,8 +2417,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 'href="/test/issue/1/edit" title="Edit this issue">',
                 output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             # Add new comment
             data = {
@@ -2512,8 +2499,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '<textarea class="form-control" id="update_comment"'
                 in output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             data['csrf_token'] = csrf_token
             data['update_comment'] = 'Second update'
@@ -2726,8 +2712,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '        <ul class="list-group list-group-flush">'
                 '\n        </ul>', output.data)
 
-            csrf_token = output.data.split(
-                'name="csrf_token" type="hidden" value="')[1].split('">')[0]
+            csrf_token = self.get_csrf(output=output)
 
             # Invalid color
             data = {