diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py
new file mode 100644
index 0000000..0d4aaa1
--- /dev/null
+++ b/tests/test_pagure_flask_docs.py
@@ -0,0 +1,215 @@
+# -*- coding: utf-8 -*-
+
+"""
+ (c) 2015 - Copyright Red Hat Inc
+
+ Authors:
+   Pierre-Yves Chibon <pingou@pingoured.fr>
+
+"""
+
+__requires__ = ['SQLAlchemy >= 0.8']
+import pkg_resources
+
+import json
+import unittest
+import shutil
+import sys
+import os
+
+import pygit2
+from mock import patch
+
+sys.path.insert(0, os.path.join(os.path.dirname(
+    os.path.abspath(__file__)), '..'))
+
+import pagure.docs_server
+import pagure.lib
+import tests
+
+
+class PagureFlaskDocstests(tests.Modeltests):
+    """ Tests for flask docs of pagure """
+
+    def setUp(self):
+        """ Set up the environnment, ran before every tests. """
+        super(PagureFlaskDocstests, self).setUp()
+
+        pagure.docs_server.APP.config['TESTING'] = True
+        pagure.docs_server.SESSION = self.session
+
+        pagure.APP.config['TESTING'] = True
+        pagure.SESSION = self.session
+        pagure.ui.SESSION = self.session
+        pagure.ui.app.SESSION = self.session
+        pagure.ui.repo.SESSION = self.session
+
+        pagure.docs_server.APP.config['GIT_FOLDER'] = tests.HERE
+        pagure.docs_server.APP.config['FORK_FOLDER'] = os.path.join(
+            tests.HERE, 'forks')
+        pagure.docs_server.APP.config['TICKETS_FOLDER'] = os.path.join(
+            tests.HERE, 'tickets')
+        pagure.docs_server.APP.config['DOCS_FOLDER'] = os.path.join(
+            tests.HERE, 'docs')
+
+        pagure.APP.config['GIT_FOLDER'] = tests.HERE
+        pagure.APP.config['FORK_FOLDER'] = os.path.join(
+            tests.HERE, 'forks')
+        pagure.APP.config['TICKETS_FOLDER'] = os.path.join(
+            tests.HERE, 'tickets')
+        pagure.APP.config['DOCS_FOLDER'] = os.path.join(
+            tests.HERE, 'docs')
+        self.app = pagure.docs_server.APP.test_client()
+
+    def test_view_docs_no_project(self):
+        """ Test the view_docs endpoint with no project. """
+
+        output = self.app.get('/foo/docs')
+        self.assertEqual(output.status_code, 404)
+
+    def test_view_docs_project_no_git(self):
+        """ Test the view_docs endpoint with a project that has no
+        corresponding git repo.
+        """
+        tests.create_projects(self.session)
+
+        output = self.app.get('/test/docs', follow_redirects=True)
+        self.assertEqual(output.status_code, 404)
+        self.assertTrue(
+            '<p>Documentation not found</p>' in output.data)
+
+        output = self.app.get('/test', follow_redirects=True)
+        self.assertEqual(output.status_code, 404)
+        self.assertTrue(
+            '<p>Documentation not found</p>' in output.data)
+
+    def test_view_docs_project_no_docs(self):
+        """ Test the view_docs endpoint with a project that disabled the
+        docs.
+        """
+        tests.create_projects(self.session)
+        repo = pagure.lib.get_project(self.session, 'test')
+        tests.create_projects_git(os.path.join(tests.HERE, 'docs'))
+
+        output = self.app.get('/test/docs')
+        self.assertEqual(output.status_code, 200)
+        self.assertTrue('<h2>Docs</h2>' in output.data)
+        self.assertTrue('<p>This repo is brand new!</p>' in output.data)
+        self.assertTrue(
+            'git clone git@pagure.org:docs/test.git' in output.data)
+
+        repo.settings = {'project_documentation': False}
+        self.session.add(repo)
+        self.session.commit()
+
+        output = self.app.get('/test/docs', follow_redirects=True)
+        self.assertEqual(output.status_code, 404)
+
+    def test_view_docs(self):
+        """ Test the view_docs endpoint. """
+        tests.create_projects(self.session)
+        repo = pygit2.init_repository(
+            os.path.join(tests.HERE, 'docs', 'test.git'), bare=True)
+
+        output = self.app.get('/test/docs')
+        self.assertEqual(output.status_code, 200)
+        self.assertTrue('<h2>Docs</h2>' in output.data)
+        self.assertTrue('<p>This repo is brand new!</p>' in output.data)
+        self.assertTrue(
+            'git clone git@pagure.org:docs/test.git' in output.data)
+
+        # forked doc repo
+        docrepo = os.path.join(tests.HERE, 'docs', 'test', 'test.git')
+        repo = pygit2.init_repository(docrepo)
+
+        # Create files in that git repo
+        with open(os.path.join(docrepo, 'sources'), 'w') as stream:
+            stream.write('foo\n bar')
+        repo.index.add('sources')
+        repo.index.write()
+
+        folderpart = os.path.join(docrepo, 'folder1', 'folder2')
+        os.makedirs(folderpart)
+        with open(os.path.join(folderpart, 'test_file'), 'w') as stream:
+            stream.write('row1\nrow2\nrow3')
+        repo.index.add(os.path.join('folder1', 'folder2', 'test_file'))
+        repo.index.write()
+
+        # Commits the files added
+        tree = repo.index.write_tree()
+        author = pygit2.Signature(
+            'Alice Author', 'alice@authors.tld')
+        committer = pygit2.Signature(
+            'Cecil Committer', 'cecil@committers.tld')
+        repo.create_commit(
+            'refs/heads/master',  # the name of the reference to update
+            author,
+            committer,
+            'Add test files and folder',
+            # binary string representing the tree object ID
+            tree,
+            # list of binary strings representing parents of the new commit
+            []
+        )
+
+        # Push the changes to the bare repo
+        remote = repo.create_remote(
+            'origin', os.path.join(tests.HERE, 'docs', 'test.git'))
+        remote.push('refs/heads/master:refs/heads/master')
+
+        # Now check the UI
+
+        output = self.app.get('/test/docs')
+        self.assertEqual(output.status_code, 200)
+        self.assertTrue('<h2>Docs</h2>' in output.data)
+        self.assertFalse('<p>This repo is brand new!</p>' in output.data)
+        self.assertTrue(
+            '<a href="/test/master/folder1">' in output.data)
+        self.assertTrue(
+            '<a href="/test/master/sources">' in output.data)
+
+        output = self.app.get('/test/master/sources')
+        self.assertEqual(output.status_code, 200)
+        self.assertTrue('<h2>Docs</h2>' in output.data)
+        self.assertTrue('<section class="docs_content">' in output.data)
+
+        output = self.app.get('/test/master/folder1/folder2')
+        self.assertEqual(output.status_code, 200)
+        self.assertTrue('<h2>Docs</h2>' in output.data)
+        self.assertTrue(
+            '<li class="file">\n        '
+            '<a href="/test/master/folder1/folder2/test_file">'
+            in output.data)
+
+        output = self.app.get('/test/master/folder1/folder2/test_file')
+        self.assertEqual(output.status_code, 200)
+        self.assertTrue('<h2>Docs</h2>' in output.data)
+        self.assertTrue(
+            '  <section class="docs_content">\n    <pre>row1\nrow2\n'
+            'row3</pre>\n  </section>' in output.data)
+
+        output = self.app.get('/test/master/folder1')
+        self.assertEqual(output.status_code, 200)
+        self.assertTrue('<h2>Docs</h2>' in output.data)
+        self.assertTrue(
+            '<li class="folder">\n        '
+            '<a href="/test/master/folder1/folder2">'
+            in output.data)
+
+        output = self.app.get('/test/master/folder1/foo')
+        self.assertEqual(output.status_code, 200)
+        self.assertTrue('<h2>Docs</h2>' in output.data)
+        self.assertTrue(
+            '<li class="error">File folder1/foo not found</li>'
+            in output.data)
+
+        output = self.app.get('/test/master/folder1/foo/folder2')
+        self.assertEqual(output.status_code, 200)
+        self.assertTrue(
+            '<li class="error">File folder1/foo/folder2 not found</li>'
+            in output.data)
+
+
+if __name__ == '__main__':
+    SUITE = unittest.TestLoader().loadTestsFromTestCase(PagureFlaskDocstests)
+    unittest.TextTestRunner(verbosity=2).run(SUITE)
diff --git a/tests/test_pragure_flask_docs.py b/tests/test_pragure_flask_docs.py
deleted file mode 100644
index 0d4aaa1..0000000
--- a/tests/test_pragure_flask_docs.py
+++ /dev/null
@@ -1,215 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
- (c) 2015 - Copyright Red Hat Inc
-
- Authors:
-   Pierre-Yves Chibon <pingou@pingoured.fr>
-
-"""
-
-__requires__ = ['SQLAlchemy >= 0.8']
-import pkg_resources
-
-import json
-import unittest
-import shutil
-import sys
-import os
-
-import pygit2
-from mock import patch
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
-
-import pagure.docs_server
-import pagure.lib
-import tests
-
-
-class PagureFlaskDocstests(tests.Modeltests):
-    """ Tests for flask docs of pagure """
-
-    def setUp(self):
-        """ Set up the environnment, ran before every tests. """
-        super(PagureFlaskDocstests, self).setUp()
-
-        pagure.docs_server.APP.config['TESTING'] = True
-        pagure.docs_server.SESSION = self.session
-
-        pagure.APP.config['TESTING'] = True
-        pagure.SESSION = self.session
-        pagure.ui.SESSION = self.session
-        pagure.ui.app.SESSION = self.session
-        pagure.ui.repo.SESSION = self.session
-
-        pagure.docs_server.APP.config['GIT_FOLDER'] = tests.HERE
-        pagure.docs_server.APP.config['FORK_FOLDER'] = os.path.join(
-            tests.HERE, 'forks')
-        pagure.docs_server.APP.config['TICKETS_FOLDER'] = os.path.join(
-            tests.HERE, 'tickets')
-        pagure.docs_server.APP.config['DOCS_FOLDER'] = os.path.join(
-            tests.HERE, 'docs')
-
-        pagure.APP.config['GIT_FOLDER'] = tests.HERE
-        pagure.APP.config['FORK_FOLDER'] = os.path.join(
-            tests.HERE, 'forks')
-        pagure.APP.config['TICKETS_FOLDER'] = os.path.join(
-            tests.HERE, 'tickets')
-        pagure.APP.config['DOCS_FOLDER'] = os.path.join(
-            tests.HERE, 'docs')
-        self.app = pagure.docs_server.APP.test_client()
-
-    def test_view_docs_no_project(self):
-        """ Test the view_docs endpoint with no project. """
-
-        output = self.app.get('/foo/docs')
-        self.assertEqual(output.status_code, 404)
-
-    def test_view_docs_project_no_git(self):
-        """ Test the view_docs endpoint with a project that has no
-        corresponding git repo.
-        """
-        tests.create_projects(self.session)
-
-        output = self.app.get('/test/docs', follow_redirects=True)
-        self.assertEqual(output.status_code, 404)
-        self.assertTrue(
-            '<p>Documentation not found</p>' in output.data)
-
-        output = self.app.get('/test', follow_redirects=True)
-        self.assertEqual(output.status_code, 404)
-        self.assertTrue(
-            '<p>Documentation not found</p>' in output.data)
-
-    def test_view_docs_project_no_docs(self):
-        """ Test the view_docs endpoint with a project that disabled the
-        docs.
-        """
-        tests.create_projects(self.session)
-        repo = pagure.lib.get_project(self.session, 'test')
-        tests.create_projects_git(os.path.join(tests.HERE, 'docs'))
-
-        output = self.app.get('/test/docs')
-        self.assertEqual(output.status_code, 200)
-        self.assertTrue('<h2>Docs</h2>' in output.data)
-        self.assertTrue('<p>This repo is brand new!</p>' in output.data)
-        self.assertTrue(
-            'git clone git@pagure.org:docs/test.git' in output.data)
-
-        repo.settings = {'project_documentation': False}
-        self.session.add(repo)
-        self.session.commit()
-
-        output = self.app.get('/test/docs', follow_redirects=True)
-        self.assertEqual(output.status_code, 404)
-
-    def test_view_docs(self):
-        """ Test the view_docs endpoint. """
-        tests.create_projects(self.session)
-        repo = pygit2.init_repository(
-            os.path.join(tests.HERE, 'docs', 'test.git'), bare=True)
-
-        output = self.app.get('/test/docs')
-        self.assertEqual(output.status_code, 200)
-        self.assertTrue('<h2>Docs</h2>' in output.data)
-        self.assertTrue('<p>This repo is brand new!</p>' in output.data)
-        self.assertTrue(
-            'git clone git@pagure.org:docs/test.git' in output.data)
-
-        # forked doc repo
-        docrepo = os.path.join(tests.HERE, 'docs', 'test', 'test.git')
-        repo = pygit2.init_repository(docrepo)
-
-        # Create files in that git repo
-        with open(os.path.join(docrepo, 'sources'), 'w') as stream:
-            stream.write('foo\n bar')
-        repo.index.add('sources')
-        repo.index.write()
-
-        folderpart = os.path.join(docrepo, 'folder1', 'folder2')
-        os.makedirs(folderpart)
-        with open(os.path.join(folderpart, 'test_file'), 'w') as stream:
-            stream.write('row1\nrow2\nrow3')
-        repo.index.add(os.path.join('folder1', 'folder2', 'test_file'))
-        repo.index.write()
-
-        # Commits the files added
-        tree = repo.index.write_tree()
-        author = pygit2.Signature(
-            'Alice Author', 'alice@authors.tld')
-        committer = pygit2.Signature(
-            'Cecil Committer', 'cecil@committers.tld')
-        repo.create_commit(
-            'refs/heads/master',  # the name of the reference to update
-            author,
-            committer,
-            'Add test files and folder',
-            # binary string representing the tree object ID
-            tree,
-            # list of binary strings representing parents of the new commit
-            []
-        )
-
-        # Push the changes to the bare repo
-        remote = repo.create_remote(
-            'origin', os.path.join(tests.HERE, 'docs', 'test.git'))
-        remote.push('refs/heads/master:refs/heads/master')
-
-        # Now check the UI
-
-        output = self.app.get('/test/docs')
-        self.assertEqual(output.status_code, 200)
-        self.assertTrue('<h2>Docs</h2>' in output.data)
-        self.assertFalse('<p>This repo is brand new!</p>' in output.data)
-        self.assertTrue(
-            '<a href="/test/master/folder1">' in output.data)
-        self.assertTrue(
-            '<a href="/test/master/sources">' in output.data)
-
-        output = self.app.get('/test/master/sources')
-        self.assertEqual(output.status_code, 200)
-        self.assertTrue('<h2>Docs</h2>' in output.data)
-        self.assertTrue('<section class="docs_content">' in output.data)
-
-        output = self.app.get('/test/master/folder1/folder2')
-        self.assertEqual(output.status_code, 200)
-        self.assertTrue('<h2>Docs</h2>' in output.data)
-        self.assertTrue(
-            '<li class="file">\n        '
-            '<a href="/test/master/folder1/folder2/test_file">'
-            in output.data)
-
-        output = self.app.get('/test/master/folder1/folder2/test_file')
-        self.assertEqual(output.status_code, 200)
-        self.assertTrue('<h2>Docs</h2>' in output.data)
-        self.assertTrue(
-            '  <section class="docs_content">\n    <pre>row1\nrow2\n'
-            'row3</pre>\n  </section>' in output.data)
-
-        output = self.app.get('/test/master/folder1')
-        self.assertEqual(output.status_code, 200)
-        self.assertTrue('<h2>Docs</h2>' in output.data)
-        self.assertTrue(
-            '<li class="folder">\n        '
-            '<a href="/test/master/folder1/folder2">'
-            in output.data)
-
-        output = self.app.get('/test/master/folder1/foo')
-        self.assertEqual(output.status_code, 200)
-        self.assertTrue('<h2>Docs</h2>' in output.data)
-        self.assertTrue(
-            '<li class="error">File folder1/foo not found</li>'
-            in output.data)
-
-        output = self.app.get('/test/master/folder1/foo/folder2')
-        self.assertEqual(output.status_code, 200)
-        self.assertTrue(
-            '<li class="error">File folder1/foo/folder2 not found</li>'
-            in output.data)
-
-
-if __name__ == '__main__':
-    SUITE = unittest.TestLoader().loadTestsFromTestCase(PagureFlaskDocstests)
-    unittest.TextTestRunner(verbosity=2).run(SUITE)