diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py
--- a/rhodecode/lib/utils.py
+++ b/rhodecode/lib/utils.py
@@ -657,12 +657,12 @@ def create_test_env(repos_test_path, con
 
     #CREATE DEFAULT TEST REPOS
     cur_dir = dn(dn(abspath(__file__)))
-    tar = tarfile.open(jn(cur_dir, 'tests', "vcs_test_hg.tar.gz"))
+    tar = tarfile.open(jn(cur_dir, 'tests', 'fixtures', "vcs_test_hg.tar.gz"))
     tar.extractall(jn(TESTS_TMP_PATH, HG_REPO))
     tar.close()
 
     cur_dir = dn(dn(abspath(__file__)))
-    tar = tarfile.open(jn(cur_dir, 'tests', "vcs_test_git.tar.gz"))
+    tar = tarfile.open(jn(cur_dir, 'tests', 'fixtures', "vcs_test_git.tar.gz"))
     tar.extractall(jn(TESTS_TMP_PATH, GIT_REPO))
     tar.close()
 
diff --git a/rhodecode/tests/vcs_test_git.tar.gz b/rhodecode/tests/fixtures/vcs_test_git.tar.gz
rename from rhodecode/tests/vcs_test_git.tar.gz
rename to rhodecode/tests/fixtures/vcs_test_git.tar.gz
diff --git a/rhodecode/tests/vcs_test_hg.tar.gz b/rhodecode/tests/fixtures/vcs_test_hg.tar.gz
rename from rhodecode/tests/vcs_test_hg.tar.gz
rename to rhodecode/tests/fixtures/vcs_test_hg.tar.gz
diff --git a/rhodecode/tests/other/__init__.py b/rhodecode/tests/other/__init__.py
new file mode 100644
diff --git a/rhodecode/tests/test_libs.py b/rhodecode/tests/other/test_libs.py
rename from rhodecode/tests/test_libs.py
rename to rhodecode/tests/other/test_libs.py
diff --git a/rhodecode/tests/test_validators.py b/rhodecode/tests/other/test_validators.py
rename from rhodecode/tests/test_validators.py
rename to rhodecode/tests/other/test_validators.py
--- a/rhodecode/tests/test_validators.py
+++ b/rhodecode/tests/other/test_validators.py
@@ -9,7 +9,6 @@ from rhodecode.model.users_group import 
 
 from rhodecode.model.meta import Session
 from rhodecode.model.repos_group import ReposGroupModel
-from rhodecode.config.routing import ADMIN_PREFIX
 from rhodecode.model.db import ChangesetStatus, Repository
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.tests.fixture import Fixture
diff --git a/rhodecode/tests/scripts/test_vcs_operations.py b/rhodecode/tests/other/test_vcs_operations.py
rename from rhodecode/tests/scripts/test_vcs_operations.py
rename to rhodecode/tests/other/test_vcs_operations.py