diff --git a/rhodecode/lib/compat.py b/rhodecode/lib/compat.py
--- a/rhodecode/lib/compat.py
+++ b/rhodecode/lib/compat.py
@@ -32,6 +32,10 @@ from rhodecode import __py_version__, is
 #==============================================================================
 from rhodecode.lib.ext_json import json
 
+if __py_version__ >= (2, 7):
+    import unittest
+else:
+    import unittest2 as unittest
 
 #==============================================================================
 # izip_longest
diff --git a/rhodecode/tests/__init__.py b/rhodecode/tests/__init__.py
--- a/rhodecode/tests/__init__.py
+++ b/rhodecode/tests/__init__.py
@@ -25,7 +25,6 @@ import hashlib
 import tempfile
 from os.path import join as jn
 
-from unittest import TestCase
 from tempfile import _RandomNameSequence
 
 from paste.deploy import loadapp
@@ -41,6 +40,7 @@ from routes.util import URLGenerator
 from webtest import TestApp
 from nose.plugins.skip import SkipTest
 
+from rhodecode.lib.compat import unittest
 from rhodecode import is_windows
 from rhodecode.model.meta import Session
 from rhodecode.model.db import User
@@ -157,11 +157,11 @@ def init_stack(config=None):
     pylons.translator._push_object(translator)
 
 
-class BaseTestCase(TestCase):
+class BaseTestCase(unittest.TestCase):
     def __init__(self, *args, **kwargs):
         self.wsgiapp = pylons.test.pylonsapp
         init_stack(self.wsgiapp.config)
-        TestCase.__init__(self, *args, **kwargs)
+        unittest.TestCase.__init__(self, *args, **kwargs)
 
 
 class TestController(BaseTestCase):