diff --git a/rhodecode/tests/vcs/test_branches.py b/rhodecode/tests/vcs/test_branches.py
--- a/rhodecode/tests/vcs/test_branches.py
+++ b/rhodecode/tests/vcs/test_branches.py
@@ -1,13 +1,12 @@
 from __future__ import with_statement
 
+import datetime
 from rhodecode.lib import vcs
-import datetime
 from rhodecode.lib.vcs.utils.compat import unittest
+from rhodecode.lib.vcs.nodes import FileNode
 
-from base import BackendTestMixin
-from conf import SCM_TESTS
-
-from rhodecode.lib.vcs.nodes import FileNode
+from rhodecode.tests.vcs.base import BackendTestMixin
+from rhodecode.tests.vcs.conf import SCM_TESTS
 
 
 class BranchesTestCaseMixin(BackendTestMixin):