diff --git a/kallithea/tests/vcs/__init__.py b/kallithea/tests/vcs/__init__.py
--- a/kallithea/tests/vcs/__init__.py
+++ b/kallithea/tests/vcs/__init__.py
@@ -19,7 +19,6 @@ function at ``tests/__init__.py``.
 .. _unittest: http://pypi.python.org/pypi/unittest
 
 """
-from kallithea.lib.vcs.utils.compat import unittest
 from kallithea.tests.vcs.conf import *
 from kallithea.tests.vcs.utils import SCMFetcher
 
@@ -49,18 +48,3 @@ def setup_package():
     for scm, fetcher_info in fetchers.items():
         fetcher = SCMFetcher(**fetcher_info)
         fetcher.setup()
-
-
-def collector():
-    setup_package()
-    start_dir = os.path.abspath(os.path.dirname(__file__))
-    return unittest.defaultTestLoader.discover(start_dir)
-
-
-def main():
-    collector()
-    unittest.main()
-
-
-#if __name__ == '__main__':
-#    main()
diff --git a/kallithea/tests/vcs/base.py b/kallithea/tests/vcs/base.py
--- a/kallithea/tests/vcs/base.py
+++ b/kallithea/tests/vcs/base.py
@@ -105,7 +105,3 @@ for alias in SCM_TESTS:
     cls_name = ''.join(('%s base backend test' % alias).title().split())
     bases = (_BackendTestMixin, unittest.TestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_archives.py b/kallithea/tests/vcs/test_archives.py
--- a/kallithea/tests/vcs/test_archives.py
+++ b/kallithea/tests/vcs/test_archives.py
@@ -109,6 +109,3 @@ for alias in SCM_TESTS:
     cls_name = ''.join(('%s archive test' % alias).title().split())
     bases = (ArchivesTestCaseMixin, unittest.TestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_branches.py b/kallithea/tests/vcs/test_branches.py
--- a/kallithea/tests/vcs/test_branches.py
+++ b/kallithea/tests/vcs/test_branches.py
@@ -1,4 +1,3 @@
-
 import datetime
 from kallithea.lib import vcs
 from kallithea.lib.vcs.utils.compat import unittest
@@ -110,7 +109,3 @@ for alias in SCM_TESTS:
     cls_name = ''.join(('%s branches test' % alias).title().split())
     bases = (BranchesTestCaseMixin, unittest.TestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_changesets.py b/kallithea/tests/vcs/test_changesets.py
--- a/kallithea/tests/vcs/test_changesets.py
+++ b/kallithea/tests/vcs/test_changesets.py
@@ -388,7 +388,3 @@ for alias in SCM_TESTS:
     cls_name = alias.title() + 'ChangesetsChangesTest'
     bases = (_ChangesetsChangesTestCaseMixin, unittest.TestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_filenodes_unicode_path.py b/kallithea/tests/vcs/test_filenodes_unicode_path.py
--- a/kallithea/tests/vcs/test_filenodes_unicode_path.py
+++ b/kallithea/tests/vcs/test_filenodes_unicode_path.py
@@ -3,7 +3,6 @@
 
 import datetime
 from kallithea.lib.vcs.nodes import FileNode
-from kallithea.lib.vcs.utils.compat import unittest
 from kallithea.tests.vcs.test_inmemchangesets import BackendBaseTestCase
 from kallithea.tests.vcs.conf import SCM_TESTS
 
@@ -42,7 +41,3 @@ for alias in SCM_TESTS:
         .split())
     bases = (FileNodeUnicodePathTestsMixin, BackendBaseTestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_getitem.py b/kallithea/tests/vcs/test_getitem.py
--- a/kallithea/tests/vcs/test_getitem.py
+++ b/kallithea/tests/vcs/test_getitem.py
@@ -1,4 +1,3 @@
-
 import datetime
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
@@ -37,7 +36,3 @@ for alias in SCM_TESTS:
     cls_name = ''.join(('%s getitem test' % alias).title().split())
     bases = (GetitemTestCaseMixin, unittest.TestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_getslice.py b/kallithea/tests/vcs/test_getslice.py
--- a/kallithea/tests/vcs/test_getslice.py
+++ b/kallithea/tests/vcs/test_getslice.py
@@ -1,4 +1,3 @@
-
 import datetime
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
@@ -49,7 +48,3 @@ for alias in SCM_TESTS:
     cls_name = ''.join(('%s getslice test' % alias).title().split())
     bases = (GetsliceTestCaseMixin, unittest.TestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_git.py b/kallithea/tests/vcs/test_git.py
--- a/kallithea/tests/vcs/test_git.py
+++ b/kallithea/tests/vcs/test_git.py
@@ -1,4 +1,3 @@
-
 import os
 import sys
 import mock
@@ -845,7 +844,3 @@ class GitHooksTest(unittest.TestCase):
         for hook, hook_path in self.kallithea_hooks.iteritems():
             with open(hook_path) as f:
                 self.assertIn("KALLITHEA_HOOK_VER", f.read())
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_hg.py b/kallithea/tests/vcs/test_hg.py
--- a/kallithea/tests/vcs/test_hg.py
+++ b/kallithea/tests/vcs/test_hg.py
@@ -1,4 +1,3 @@
-
 import os
 
 import pytest
diff --git a/kallithea/tests/vcs/test_inmemchangesets.py b/kallithea/tests/vcs/test_inmemchangesets.py
--- a/kallithea/tests/vcs/test_inmemchangesets.py
+++ b/kallithea/tests/vcs/test_inmemchangesets.py
@@ -388,7 +388,3 @@ for alias in SCM_TESTS:
     cls_name = ''.join(('%s in memory changeset test' % alias).title().split())
     bases = (InMemoryChangesetTestMixin, unittest.TestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_nodes.py b/kallithea/tests/vcs/test_nodes.py
--- a/kallithea/tests/vcs/test_nodes.py
+++ b/kallithea/tests/vcs/test_nodes.py
@@ -1,4 +1,3 @@
-
 import stat
 import mimetypes
 from kallithea.lib.vcs.nodes import DirNode
@@ -177,7 +176,3 @@ class NodeContentTest(unittest.TestCase)
         data = """\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f??a\x00\x00\x00\x04gAMA\x00\x00\xaf?7\x05\x8a?\x00\x00\x00\x19tEXtSoftware\x00Adobe ImageReadyq?e<\x00\x00\x025IDAT8?\xa5\x93?K\x94Q\x14\x87\x9f\xf7?Q\x1bs4?\x03\x9a\xa8?B\x02\x8b$\x10[U;i\x13?6h?&h[?"\x14j?\xa2M\x7fB\x14F\x9aQ?&\x842?\x0b\x89"\x82??!?\x9c!\x9c2l??{N\x8bW\x9dY\xb4\t/\x1c?=\x9b?}????\xa9*;9!?\x83\x91?[?\\v*?D\x04\'`EpNp\xa2X\'U?pVq"Sw.\x1e?\x08\x01D?jw????\xbc??7{|\x9b?\x89$\x01??W@\x15\x9c\x05q`Lt/\x97?\x94\xa1d?\x18~?\x18?\x18W[%\xb0?\x83??\x14\x88\x8dB?\xa6H\tL\tl\x19>/\x01`\xac\xabx?\x9cl\nx\xb0\x98\x07\x95\x88D$"q[\x19?d\x00(o\n\xa0??\x7f\xb9\xa4?\x1bF\x1f\x8e\xac\xa8?j??eUU}?.?\x9f\x8cE??x\x94??\r\xbdtoJU5"0N\x10U?\x00??V\t\x02\x9f\x81?U?\x00\x9eM\xae2?r\x9b7\x83\x82\x8aP3????.?&"?\xb7ZP \x0c<?O\xa5\t}\xb8?\x99\xa6?\x87?\x1di|/\xa0??0\xbe\x1fp?d&\x1a\xad\x95\x8a\x07?\t*\x10??b:?d?.\x13C\x8a?\x12\xbe\xbf\x8e?{???\x08?\x80\xa7\x13+d\x13>J?\x80\x15T\x95\x9a\x00??S\x8c\r?\xa1\x03\x07?\x96\x9b\xa7\xab=E??\xa4\xb3?\x19q??B\x91=\x8d??k?J\x0bV"??\xf7x?\xa1\x00?\\.\x87\x87???\x02F@D\x99],??\x10#?X\xb7=\xb9\x10?Z\x1by???cI??\x1ag?\x92\xbc?T?t[\x92\x81?<_\x17~\x92\x88?H%?\x10Q\x02\x9f\n\x81qQ\x0bm?\x1bX?\xb1AK\xa6\x9e\xb9?u\xb2?1\xbe|/\x92M@\xa2!F?\xa9>"\r<DT?>\x92\x8e?>\x9a9Qv\x127?a\xac?Y?8?:??]X???9\x80\xb7?u?\x0b#BZ\x8d=\x1d?p\x00\x00\x00\x00IEND\xaeB`\x82"""
         filenode = FileNode('calendar.png', content=data)
         self.assertTrue(filenode.is_binary)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_repository.py b/kallithea/tests/vcs/test_repository.py
--- a/kallithea/tests/vcs/test_repository.py
+++ b/kallithea/tests/vcs/test_repository.py
@@ -223,6 +223,3 @@ for alias in SCM_TESTS:
     cls_name = alias.capitalize() + RepositoryBaseTest.__name__
     bases = (RepositoryBaseTest, unittest.TestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_tags.py b/kallithea/tests/vcs/test_tags.py
--- a/kallithea/tests/vcs/test_tags.py
+++ b/kallithea/tests/vcs/test_tags.py
@@ -1,4 +1,3 @@
-
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import SCM_TESTS
 from kallithea.lib.vcs.exceptions import TagAlreadyExistError
@@ -53,7 +52,3 @@ for alias in SCM_TESTS:
     cls_name = ''.join(('%s tags test' % alias).title().split())
     bases = (TagsTestCaseMixin, unittest.TestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_utils.py b/kallithea/tests/vcs/test_utils.py
--- a/kallithea/tests/vcs/test_utils.py
+++ b/kallithea/tests/vcs/test_utils.py
@@ -270,7 +270,3 @@ class TestGetUserHome(unittest.TestCase)
         'USERPROFILE': '/Users/foobar'})
     def test_prefers_home_over_userprofile(self):
         self.assertEqual(get_user_home(), '/home/foobar')
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_utils_filesize.py b/kallithea/tests/vcs/test_utils_filesize.py
--- a/kallithea/tests/vcs/test_utils_filesize.py
+++ b/kallithea/tests/vcs/test_utils_filesize.py
@@ -1,4 +1,3 @@
-
 from kallithea.lib.vcs.utils.filesize import filesizeformat
 from kallithea.lib.vcs.utils.compat import unittest
 
@@ -19,7 +18,3 @@ class TestFilesizeformat(unittest.TestCa
 
     def test_that_function_respects_sep_parameter(self):
         self.assertEqual(filesizeformat(1, ''), '1B')
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/kallithea/tests/vcs/test_workdirs.py b/kallithea/tests/vcs/test_workdirs.py
--- a/kallithea/tests/vcs/test_workdirs.py
+++ b/kallithea/tests/vcs/test_workdirs.py
@@ -1,4 +1,3 @@
-
 import datetime
 from kallithea.lib.vcs.nodes import FileNode
 from kallithea.lib.vcs.utils.compat import unittest
@@ -91,7 +90,3 @@ for alias in SCM_TESTS:
     cls_name = ''.join(('%s branch test' % alias).title().split())
     bases = (WorkdirTestCaseMixin, unittest.TestCase)
     globals()[cls_name] = type(cls_name, bases, attrs)
-
-
-if __name__ == '__main__':
-    unittest.main()