diff --git a/kallithea/tests/functional/test_admin_auth_settings.py b/kallithea/tests/functional/test_admin_auth_settings.py
--- a/kallithea/tests/functional/test_admin_auth_settings.py
+++ b/kallithea/tests/functional/test_admin_auth_settings.py
@@ -2,7 +2,7 @@ from kallithea.tests import *
 from kallithea.model.db import Setting
 
 
-class TestAuthSettingsController(TestController):
+class TestAuthSettingsController(TestControllerPytest):
     def _enable_plugins(self, plugins_list):
         test_url = url(controller='admin/auth_settings',
                        action='auth_settings')
diff --git a/kallithea/tests/functional/test_admin_defaults.py b/kallithea/tests/functional/test_admin_defaults.py
--- a/kallithea/tests/functional/test_admin_defaults.py
+++ b/kallithea/tests/functional/test_admin_defaults.py
@@ -2,7 +2,7 @@ from kallithea.tests import *
 from kallithea.model.db import Setting
 
 
-class TestDefaultsController(TestController):
+class TestDefaultsController(TestControllerPytest):
 
     def test_index(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_admin_permissions.py b/kallithea/tests/functional/test_admin_permissions.py
--- a/kallithea/tests/functional/test_admin_permissions.py
+++ b/kallithea/tests/functional/test_admin_permissions.py
@@ -1,7 +1,7 @@
 from kallithea.model.db import User, UserIpMap
 from kallithea.tests import *
 
-class TestAdminPermissionsController(TestController):
+class TestAdminPermissionsController(TestControllerPytest):
 
     def test_index(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_admin_repo_groups.py b/kallithea/tests/functional/test_admin_repo_groups.py
--- a/kallithea/tests/functional/test_admin_repo_groups.py
+++ b/kallithea/tests/functional/test_admin_repo_groups.py
@@ -1,4 +1,4 @@
 from kallithea.tests import *
 
-class TestRepoGroupsController(TestController):
+class TestRepoGroupsController(TestControllerPytest):
     pass
diff --git a/kallithea/tests/functional/test_admin_settings.py b/kallithea/tests/functional/test_admin_settings.py
--- a/kallithea/tests/functional/test_admin_settings.py
+++ b/kallithea/tests/functional/test_admin_settings.py
@@ -7,7 +7,7 @@ from kallithea.tests.fixture import Fixt
 fixture = Fixture()
 
 
-class TestAdminSettingsController(TestController):
+class TestAdminSettingsController(TestControllerPytest):
 
     def test_index_main(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_admin_user_groups.py b/kallithea/tests/functional/test_admin_user_groups.py
--- a/kallithea/tests/functional/test_admin_user_groups.py
+++ b/kallithea/tests/functional/test_admin_user_groups.py
@@ -6,7 +6,7 @@ from kallithea.model.meta import Session
 TEST_USER_GROUP = u'admins_test'
 
 
-class TestAdminUsersGroupsController(TestController):
+class TestAdminUsersGroupsController(TestControllerPytest):
 
     def test_index(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_admin_users.py b/kallithea/tests/functional/test_admin_users.py
--- a/kallithea/tests/functional/test_admin_users.py
+++ b/kallithea/tests/functional/test_admin_users.py
@@ -532,7 +532,7 @@ class TestAdminUsersController(TestContr
 #            u._get_user_or_raise_if_default(User.get_default_user().user_id)
 
 
-class TestAdminUsersControllerForDefaultUser(TestController):
+class TestAdminUsersControllerForDefaultUser(TestControllerPytest):
     """
     Edit actions on the default user are not allowed.
     Validate that they throw a 404 exception.
diff --git a/kallithea/tests/functional/test_branches.py b/kallithea/tests/functional/test_branches.py
--- a/kallithea/tests/functional/test_branches.py
+++ b/kallithea/tests/functional/test_branches.py
@@ -1,7 +1,7 @@
 from kallithea.tests import *
 
 
-class TestBranchesController(TestController):
+class TestBranchesController(TestControllerPytest):
 
     def test_index_hg(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_changelog.py b/kallithea/tests/functional/test_changelog.py
--- a/kallithea/tests/functional/test_changelog.py
+++ b/kallithea/tests/functional/test_changelog.py
@@ -1,7 +1,7 @@
 from kallithea.tests import *
 
 
-class TestChangelogController(TestController):
+class TestChangelogController(TestControllerPytest):
 
     def test_index_hg(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_changeset.py b/kallithea/tests/functional/test_changeset.py
--- a/kallithea/tests/functional/test_changeset.py
+++ b/kallithea/tests/functional/test_changeset.py
@@ -1,6 +1,6 @@
 from kallithea.tests import *
 
-class TestChangesetController(TestController):
+class TestChangesetController(TestControllerPytest):
 
     def test_index(self):
         response = self.app.get(url(controller='changeset', action='index',
diff --git a/kallithea/tests/functional/test_compare_local.py b/kallithea/tests/functional/test_compare_local.py
--- a/kallithea/tests/functional/test_compare_local.py
+++ b/kallithea/tests/functional/test_compare_local.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from kallithea.tests import *
 
-class TestCompareController(TestController):
+class TestCompareController(TestControllerPytest):
 
     def test_compare_tag_hg(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_feed.py b/kallithea/tests/functional/test_feed.py
--- a/kallithea/tests/functional/test_feed.py
+++ b/kallithea/tests/functional/test_feed.py
@@ -1,6 +1,6 @@
 from kallithea.tests import *
 
-class TestFeedController(TestController):
+class TestFeedController(TestControllerPytest):
 
     def test_rss(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_followers.py b/kallithea/tests/functional/test_followers.py
--- a/kallithea/tests/functional/test_followers.py
+++ b/kallithea/tests/functional/test_followers.py
@@ -1,7 +1,7 @@
 from kallithea.tests import *
 
 
-class TestFollowersController(TestController):
+class TestFollowersController(TestControllerPytest):
 
     def test_index_hg(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_home.py b/kallithea/tests/functional/test_home.py
--- a/kallithea/tests/functional/test_home.py
+++ b/kallithea/tests/functional/test_home.py
@@ -9,7 +9,7 @@ from kallithea.model.repo_group import R
 fixture = Fixture()
 
 
-class TestHomeController(TestController):
+class TestHomeController(TestControllerPytest):
 
     def test_index(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_journal.py b/kallithea/tests/functional/test_journal.py
--- a/kallithea/tests/functional/test_journal.py
+++ b/kallithea/tests/functional/test_journal.py
@@ -2,7 +2,7 @@ from kallithea.tests import *
 import datetime
 
 
-class TestJournalController(TestController):
+class TestJournalController(TestControllerPytest):
 
     def test_index(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_pullrequests.py b/kallithea/tests/functional/test_pullrequests.py
--- a/kallithea/tests/functional/test_pullrequests.py
+++ b/kallithea/tests/functional/test_pullrequests.py
@@ -8,7 +8,7 @@ from kallithea.controllers.pullrequests 
 
 fixture = Fixture()
 
-class TestPullrequestsController(TestController):
+class TestPullrequestsController(TestControllerPytest):
 
     def test_index(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_repo_groups.py b/kallithea/tests/functional/test_repo_groups.py
--- a/kallithea/tests/functional/test_repo_groups.py
+++ b/kallithea/tests/functional/test_repo_groups.py
@@ -1,7 +1,7 @@
 from kallithea.tests import *
 
 
-class TestRepoGroupsController(TestController):
+class TestRepoGroupsController(TestControllerPytest):
 
     def test_index(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_summary.py b/kallithea/tests/functional/test_summary.py
--- a/kallithea/tests/functional/test_summary.py
+++ b/kallithea/tests/functional/test_summary.py
@@ -22,7 +22,7 @@ from kallithea.model.scm import ScmModel
 fixture = Fixture()
 
 
-class TestSummaryController(TestController):
+class TestSummaryController(TestControllerPytest):
 
     def test_index(self):
         self.log_user()
diff --git a/kallithea/tests/functional/test_tags.py b/kallithea/tests/functional/test_tags.py
--- a/kallithea/tests/functional/test_tags.py
+++ b/kallithea/tests/functional/test_tags.py
@@ -1,7 +1,7 @@
 from kallithea.tests import *
 
 
-class TestTagsController(TestController):
+class TestTagsController(TestControllerPytest):
 
     def test_index_hg(self):
         self.log_user()