diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py
index 6981d7e..96ffc6f 100644
--- a/tests/test_pagure_flask_ui_fork.py
+++ b/tests/test_pagure_flask_ui_fork.py
@@ -66,7 +66,6 @@ class PagureFlaskForktests(tests.Modeltests):
         pagure.ui.issues.SESSION = self.session
 
         pagure.APP.config['GIT_FOLDER'] = os.path.join(tests.HERE, 'repos')
-        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(
@@ -588,7 +587,7 @@ class PagureFlaskForktests(tests.Modeltests):
         tests.create_projects_git(
             os.path.join(tests.HERE, 'requests'), bare=True)
         tests.create_projects_git(
-            os.path.join(tests.HERE, 'forks', 'foo'), bare=True)
+            os.path.join(tests.HERE, 'repos', 'forks', 'foo'), bare=True)
 
         # Create a git repo to play with
         gitrepo = os.path.join(tests.HERE, 'repos', 'test.git')
@@ -598,7 +597,7 @@ class PagureFlaskForktests(tests.Modeltests):
 
         # Create a fork of this repo
         newpath = tempfile.mkdtemp(prefix='pagure-fork-test')
-        gitrepo = os.path.join(tests.HERE, 'forks', 'foo', 'test.git')
+        gitrepo = os.path.join(tests.HERE, 'repos', 'forks', 'foo', 'test.git')
         new_repo = pygit2.clone_repository(gitrepo, newpath)
 
         # Edit the sources file again
@@ -671,7 +670,7 @@ class PagureFlaskForktests(tests.Modeltests):
         tests.create_projects_git(
             os.path.join(tests.HERE, 'requests'), bare=True)
         tests.create_projects_git(
-            os.path.join(tests.HERE, 'forks', 'foo'), bare=True)
+            os.path.join(tests.HERE, 'repos', 'forks', 'foo'), bare=True)
 
         # Create a git repo to play with
         gitrepo = os.path.join(tests.HERE, 'repos', 'test.git')
@@ -681,7 +680,8 @@ class PagureFlaskForktests(tests.Modeltests):
 
         # Create a fork of this repo
         newpath = tempfile.mkdtemp(prefix='pagure-fork-test')
-        gitrepo = os.path.join(tests.HERE, 'forks', 'foo', 'test.git')
+        gitrepo = os.path.join(
+            tests.HERE, 'repos', 'forks', 'foo', 'test.git')
         new_repo = pygit2.clone_repository(gitrepo, newpath)
 
         # Create a PR for these "changes" (there are none, both repos are
@@ -926,7 +926,7 @@ index 9f44358..2a552bb 100644
         tests.create_projects_git(
             os.path.join(tests.HERE, 'requests'), bare=True)
         tests.create_projects_git(
-            os.path.join(tests.HERE, 'forks', 'foo'), bare=True)
+            os.path.join(tests.HERE, 'repos', 'forks', 'foo'), bare=True)
 
         # Create a git repo to play with
         gitrepo = os.path.join(tests.HERE, 'repos', 'test.git')
@@ -936,7 +936,8 @@ index 9f44358..2a552bb 100644
 
         # Create a fork of this repo
         newpath = tempfile.mkdtemp(prefix='pagure-fork-test')
-        gitrepo = os.path.join(tests.HERE, 'forks', 'foo', 'test.git')
+        gitrepo = os.path.join(
+            tests.HERE, 'repos', 'forks', 'foo', 'test.git')
         new_repo = pygit2.clone_repository(gitrepo, newpath)
 
         # Edit the sources file again
@@ -981,7 +982,8 @@ index 9f44358..2a552bb 100644
         self.assertEqual(req.id, 1)
         self.assertEqual(req.title, 'PR from the feature branch')
 
-        output = self.app.get('/test/pull-request/1.patch', follow_redirects=True)
+        output = self.app.get(
+            '/test/pull-request/1.patch', follow_redirects=True)
         self.assertEqual(output.status_code, 200)
 
         npatch = []
@@ -1038,7 +1040,7 @@ index 0000000..2a552bb
         tests.create_projects_git(
             os.path.join(tests.HERE, 'requests'), bare=True)
         tests.create_projects_git(
-            os.path.join(tests.HERE, 'forks', 'foo'), bare=True)
+            os.path.join(tests.HERE, 'repos', 'forks', 'foo'), bare=True)
 
         # Create a git repo to play with
         gitrepo = os.path.join(tests.HERE, 'repos', 'test.git')
@@ -1048,7 +1050,8 @@ index 0000000..2a552bb
 
         # Create a fork of this repo
         newpath = tempfile.mkdtemp(prefix='pagure-fork-test')
-        gitrepo = os.path.join(tests.HERE, 'forks', 'foo', 'test.git')
+        gitrepo = os.path.join(
+            tests.HERE, 'repos', 'forks', 'foo', 'test.git')
         new_repo = pygit2.clone_repository(gitrepo, newpath)
 
         # Create a PR for these "changes" (there are none, both repos are
@@ -1441,7 +1444,7 @@ index 0000000..2a552bb
 
         # Create a fork of this repo
         newpath = tempfile.mkdtemp(prefix='pagure-fork-test')
-        gitrepo = os.path.join(tests.HERE, 'forks', 'foo', 'test.git')
+        gitrepo = os.path.join(tests.HERE, 'repos', 'forks', 'foo', 'test.git')
         new_repo = pygit2.clone_repository(gitrepo, newpath)
 
         user = tests.FakeUser()
@@ -1496,7 +1499,8 @@ index 0000000..2a552bb
 
         # Create a fork of this repo
         newpath = tempfile.mkdtemp(prefix='pagure-fork-test')
-        gitrepo = os.path.join(tests.HERE, 'forks', 'foo', 'test.git')
+        gitrepo = os.path.join(
+            tests.HERE, 'repos', 'forks', 'foo', 'test.git')
         new_repo = pygit2.clone_repository(gitrepo, newpath)
 
         user = tests.FakeUser()
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 2e31544..6d8f7f1 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -496,13 +496,13 @@ class PagureFlaskRepotests(tests.Modeltests):
     def test_view_forks(self):
         """ Test the view_forks endpoint. """
 
-        output = self.app.get('/foo/forks')
+        output = self.app.get('/foo/forks', follow_redirects=True)
         self.assertEqual(output.status_code, 404)
 
         tests.create_projects(self.session)
         tests.create_projects_git(tests.HERE, bare=True)
 
-        output = self.app.get('/test/forks')
+        output = self.app.get('/test/forks', follow_redirects=True)
         self.assertEqual(output.status_code, 200)
         self.assertTrue('This project has not been forked.' in output.data)
 
@@ -1043,19 +1043,19 @@ class PagureFlaskRepotests(tests.Modeltests):
 
     def test_view_commit(self):
         """ Test the view_commit endpoint. """
-        output = self.app.get('/foo/bar')
+        output = self.app.get('/foo/c/bar')
         # No project registered in the DB
         self.assertEqual(output.status_code, 404)
 
         tests.create_projects(self.session)
 
-        output = self.app.get('/test/bar')
+        output = self.app.get('/test/c/bar')
         # No git repo associated
         self.assertEqual(output.status_code, 404)
 
         tests.create_projects_git(tests.HERE, bare=True)
 
-        output = self.app.get('/test/bar')
+        output = self.app.get('/test/c/bar')
         self.assertEqual(output.status_code, 404)
 
         # Add a README to the git repo - First commit
@@ -1064,7 +1064,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         commit = repo.revparse_single('HEAD')
 
         # View first commit
-        output = self.app.get('/test/%s' % commit.oid.hex)
+        output = self.app.get('/test/c/%s' % commit.oid.hex)
         self.assertEqual(output.status_code, 200)
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
@@ -1083,7 +1083,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         commit = repo.revparse_single('HEAD')
 
         # View another commit
-        output = self.app.get('/test/%s' % commit.oid.hex)
+        output = self.app.get('/test/c/%s' % commit.oid.hex)
         self.assertEqual(output.status_code, 200)
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
@@ -1124,11 +1124,12 @@ class PagureFlaskRepotests(tests.Modeltests):
         commit = repo.revparse_single('HEAD')
 
         # Commit does not exist in anothe repo :)
-        output = self.app.get('/test/%s' % commit.oid.hex)
+        output = self.app.get('/test/c/%s' % commit.oid.hex)
         self.assertEqual(output.status_code, 404)
 
         # View commit of fork
-        output = self.app.get('/fork/pingou/test3/%s' % commit.oid.hex)
+        output = self.app.get(
+            '/fork/pingou/test3/c/%s' % commit.oid.hex)
         self.assertEqual(output.status_code, 200)
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
@@ -1142,19 +1143,20 @@ class PagureFlaskRepotests(tests.Modeltests):
 
     def test_view_commit_patch(self):
         """ Test the view_commit_patch endpoint. """
-        output = self.app.get('/foo/bar.patch')
+
         # No project registered in the DB
+        output = self.app.get('/foo/c/bar.patch')
         self.assertEqual(output.status_code, 404)
 
         tests.create_projects(self.session)
 
-        output = self.app.get('/test/bar.patch')
+        output = self.app.get('/test/c/bar.patch')
         # No git repo associated
         self.assertEqual(output.status_code, 404)
 
         tests.create_projects_git(tests.HERE, bare=True)
 
-        output = self.app.get('/test/bar.patch')
+        output = self.app.get('/test/c/bar.patch')
         self.assertEqual(output.status_code, 404)
 
         # Add a README to the git repo - First commit
@@ -1163,7 +1165,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         commit = repo.revparse_single('HEAD')
 
         # View first commit
-        output = self.app.get('/test/%s.patch' % commit.oid.hex)
+        output = self.app.get('/test/c/%s.patch' % commit.oid.hex)
         self.assertEqual(output.status_code, 200)
         self.assertTrue('''diff --git a/README.rst b/README.rst
 new file mode 100644
@@ -1197,7 +1199,7 @@ index 0000000..fb7093d
         commit = repo.revparse_single('HEAD')
 
         # View another commit
-        output = self.app.get('/test/%s.patch' % commit.oid.hex)
+        output = self.app.get('/test/c/%s.patch' % commit.oid.hex)
         self.assertEqual(output.status_code, 200)
         self.assertTrue(
             'Subject: Add some directory and a file for more testing'
@@ -1233,11 +1235,12 @@ index 0000000..11980b1
         commit = repo.revparse_single('HEAD')
 
         # Commit does not exist in anothe repo :)
-        output = self.app.get('/test/%s.patch' % commit.oid.hex)
+        output = self.app.get('/test/c/%s.patch' % commit.oid.hex)
         self.assertEqual(output.status_code, 404)
 
         # View commit of fork
-        output = self.app.get('/fork/pingou/test3/%s.patch' % commit.oid.hex)
+        output = self.app.get(
+            '/fork/pingou/test3/c/%s.patch' % commit.oid.hex)
         self.assertEqual(output.status_code, 200)
         self.assertTrue('''diff --git a/README.rst b/README.rst
 new file mode 100644
@@ -2219,7 +2222,7 @@ index 0000000..fb7093d
 
     def test_delete_branch(self):
         """ Test the delete_branch endpoint. """
-        output = self.app.post('/foo/master/delete')
+        output = self.app.post('/foo/b/master/delete')
         # No project registered in the DB
         self.assertEqual(output.status_code, 302)
 
@@ -2227,16 +2230,16 @@ index 0000000..fb7093d
 
         user = tests.FakeUser()
         with tests.user_set(pagure.APP, user):
-            output = self.app.post('/foo/master/delete')
+            output = self.app.post('/foo/b/master/delete')
             # Unknown repo
             self.assertEqual(output.status_code, 404)
 
-            output = self.app.post('/test/master/delete')
+            output = self.app.post('/test/b/master/delete')
             self.assertEqual(output.status_code, 403)
 
         user.username = 'pingou'
         with tests.user_set(pagure.APP, user):
-            output = self.app.post('/test/master/delete')
+            output = self.app.post('/test/b/master/delete')
             self.assertEqual(output.status_code, 403)
             self.assertIn(
                 '<p>You are not allowed to delete the master branch</p>',
@@ -2244,7 +2247,7 @@ index 0000000..fb7093d
 
             tests.create_projects_git(tests.HERE, bare=True)
 
-            output = self.app.post('/test/bar/delete')
+            output = self.app.post('/test/b/bar/delete')
             self.assertEqual(output.status_code, 404)
             self.assertIn('<p>Branch no found</p>', output.data)
 
@@ -2255,7 +2258,7 @@ index 0000000..fb7093d
             repo.create_branch('foo', repo.head.get_object())
 
             # Check before deletion
-            output = self.app.post('/test', follow_redirects=True)
+            output = self.app.get('/test')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
                 '<a class="dropdown-item" href="/test/branch/foo">',
@@ -2266,7 +2269,7 @@ index 0000000..fb7093d
                 output.data)
 
             # Delete the branch
-            output = self.app.post('/test/foo/delete', follow_redirects=True)
+            output = self.app.post('/test/b/foo/delete', follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertNotIn(
                 '<a class="dropdown-item" href="/test/branch/foo">',
@@ -2284,7 +2287,7 @@ index 0000000..fb7093d
             repo.create_branch('feature/foo', repo.head.get_object())
 
             # Check before deletion
-            output = self.app.post('/test', follow_redirects=True)
+            output = self.app.get('/test')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
                 '<a class="dropdown-item" href="/test/branch/feature/foo">',
@@ -2296,7 +2299,7 @@ index 0000000..fb7093d
                 output.data)
 
             # Delete the branch
-            output = self.app.post('/test/feature/foo/delete', follow_redirects=True)
+            output = self.app.post('/test/b/feature/foo/delete', follow_redirects=True)
             self.assertEqual(output.status_code, 200)
             self.assertNotIn(
                 '<a class="dropdown-item" href="/test/branch/feature/foo">',
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index 0f8d576..d61647c 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -1096,7 +1096,6 @@ class PagureLibtests(tests.Modeltests):
         docfolder = os.path.join(self.path, 'docs')
         ticketfolder = os.path.join(self.path, 'tickets')
         requestfolder = os.path.join(self.path, 'requests')
-        forkfolder = os.path.join(self.path, 'forks')
 
         os.mkdir(gitfolder)
         os.mkdir(docfolder)
@@ -1136,7 +1135,8 @@ class PagureLibtests(tests.Modeltests):
         self.assertTrue(os.path.exists(requestrepo))
 
         # Git repo exists
-        grepo = '%s.git' % os.path.join(forkfolder, 'foo', 'testproject')
+        grepo = '%s.git' % os.path.join(
+            gitfolder, 'forks', 'foo', 'testproject')
         os.makedirs(grepo)
         self.assertRaises(
             pagure.exceptions.PagureException,
@@ -1145,7 +1145,6 @@ class PagureLibtests(tests.Modeltests):
             user='foo',
             repo=repo,
             gitfolder=gitfolder,
-            forkfolder=forkfolder,
             docfolder=docfolder,
             ticketfolder=ticketfolder,
             requestfolder=requestfolder,
@@ -1154,7 +1153,8 @@ class PagureLibtests(tests.Modeltests):
         shutil.rmtree(grepo)
 
         # Doc repo exists
-        grepo = '%s.git' % os.path.join(docfolder, 'foo', 'testproject')
+        grepo = '%s.git' % os.path.join(
+            docfolder, 'forks', 'foo', 'testproject')
         os.makedirs(grepo)
         self.assertRaises(
             pagure.exceptions.PagureException,
@@ -1163,7 +1163,6 @@ class PagureLibtests(tests.Modeltests):
             user='foo',
             repo=repo,
             gitfolder=gitfolder,
-            forkfolder=forkfolder,
             docfolder=docfolder,
             ticketfolder=ticketfolder,
             requestfolder=requestfolder,
@@ -1172,7 +1171,8 @@ class PagureLibtests(tests.Modeltests):
         shutil.rmtree(grepo)
 
         # Ticket repo exists
-        grepo = '%s.git' % os.path.join(ticketfolder, 'foo', 'testproject')
+        grepo = '%s.git' % os.path.join(
+            ticketfolder, 'forks', 'foo', 'testproject')
         os.makedirs(grepo)
         self.assertRaises(
             pagure.exceptions.PagureException,
@@ -1181,7 +1181,6 @@ class PagureLibtests(tests.Modeltests):
             user='foo',
             repo=repo,
             gitfolder=gitfolder,
-            forkfolder=forkfolder,
             docfolder=docfolder,
             ticketfolder=ticketfolder,
             requestfolder=requestfolder,
@@ -1190,7 +1189,8 @@ class PagureLibtests(tests.Modeltests):
         shutil.rmtree(grepo)
 
         # Request repo exists
-        grepo = '%s.git' % os.path.join(requestfolder, 'foo', 'testproject')
+        grepo = '%s.git' % os.path.join(
+            requestfolder, 'forks', 'foo', 'testproject')
         os.makedirs(grepo)
         self.assertRaises(
             pagure.exceptions.PagureException,
@@ -1199,7 +1199,6 @@ class PagureLibtests(tests.Modeltests):
             user='foo',
             repo=repo,
             gitfolder=gitfolder,
-            forkfolder=forkfolder,
             docfolder=docfolder,
             ticketfolder=ticketfolder,
             requestfolder=requestfolder,
@@ -1217,7 +1216,6 @@ class PagureLibtests(tests.Modeltests):
             user='foo',
             repo=repo,
             gitfolder=gitfolder,
-            forkfolder=forkfolder,
             docfolder=docfolder,
             ticketfolder=ticketfolder,
             requestfolder=requestfolder,
@@ -1239,7 +1237,6 @@ class PagureLibtests(tests.Modeltests):
             user='pingou',
             repo=repo,
             gitfolder=gitfolder,
-            forkfolder=forkfolder,
             docfolder=docfolder,
             ticketfolder=ticketfolder,
             requestfolder=requestfolder,
diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py
index bb90894..795e8f3 100644
--- a/tests/test_pagure_lib_git.py
+++ b/tests/test_pagure_lib_git.py
@@ -1079,7 +1079,6 @@ index 0000000..60f7480
             request_uid='d4182a2ac2d541d884742d3037c26e56',
             json_data=data,
             gitfolder=tests.HERE,
-            forkfolder=os.path.join(tests.HERE, 'forks'),
             docfolder=os.path.join(tests.HERE, 'docs'),
             ticketfolder=os.path.join(tests.HERE, 'tickets'),
             requestfolder=os.path.join(tests.HERE, 'requests')
@@ -1092,7 +1091,6 @@ index 0000000..60f7480
             request_uid='d4182a2ac2d541d884742d3037c26e56',
             json_data=data,
             gitfolder=tests.HERE,
-            forkfolder=os.path.join(tests.HERE, 'forks'),
             docfolder=os.path.join(tests.HERE, 'docs'),
             ticketfolder=os.path.join(tests.HERE, 'tickets'),
             requestfolder=os.path.join(tests.HERE, 'requests')
@@ -1196,7 +1194,6 @@ index 0000000..60f7480
             request_uid='d4182a2ac2d541d884742d3037c26e57',
             json_data=data,
             gitfolder=tests.HERE,
-            forkfolder=os.path.join(tests.HERE, 'forks'),
             docfolder=os.path.join(tests.HERE, 'docs'),
             ticketfolder=os.path.join(tests.HERE, 'tickets'),
             requestfolder=os.path.join(tests.HERE, 'requests')