diff --git a/python/ycm/client/tests/__init__.py b/python/ycm/tests/client/__init__.py
similarity index 100%
rename from python/ycm/client/tests/__init__.py
rename to python/ycm/tests/client/__init__.py
diff --git a/python/ycm/client/tests/command_request_test.py b/python/ycm/tests/client/command_request_test.py
similarity index 100%
rename from python/ycm/client/tests/command_request_test.py
rename to python/ycm/tests/client/command_request_test.py
diff --git a/python/ycm/client/tests/completion_request_test.py b/python/ycm/tests/client/completion_request_test.py
similarity index 99%
rename from python/ycm/client/tests/completion_request_test.py
rename to python/ycm/tests/client/completion_request_test.py
index b10a1734..0c764522 100644
--- a/python/ycm/client/tests/completion_request_test.py
+++ b/python/ycm/tests/client/completion_request_test.py
@@ -27,7 +27,7 @@ from nose.tools import eq_
 from ycm.tests.test_utils import MockVimModule
 vim_mock = MockVimModule()
 
-from .. import completion_request
+from ycm.client import completion_request
 
 
 class ConvertCompletionResponseToVimDatas_test( object ):
diff --git a/python/ycm/client/tests/omni_completion_request_tests.py b/python/ycm/tests/client/omni_completion_request_tests.py
similarity index 100%
rename from python/ycm/client/tests/omni_completion_request_tests.py
rename to python/ycm/tests/client/omni_completion_request_tests.py