diff --git a/MANIFEST.in b/MANIFEST.in
index 849cc7d52..27a83b356 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,4 @@ include COPYING AUTHORS ChangeLog.rst RELEASE_NOTES.rst requirements.txt test-re
 include tox.ini .travis.yml
 recursive-include tests *
 recursive-include docs *j2 *.py *.rst api/*.rst Makefile make.bat
-recursive-include gitlab/tests/data *
+recursive-include tests/unit/data *
diff --git a/gitlab/tests/__init__.py b/tests/unit/__init__.py
similarity index 100%
rename from gitlab/tests/__init__.py
rename to tests/unit/__init__.py
diff --git a/gitlab/tests/conftest.py b/tests/unit/conftest.py
similarity index 100%
rename from gitlab/tests/conftest.py
rename to tests/unit/conftest.py
diff --git a/gitlab/tests/data/todo.json b/tests/unit/data/todo.json
similarity index 100%
rename from gitlab/tests/data/todo.json
rename to tests/unit/data/todo.json
diff --git a/gitlab/tests/mixins/test_meta_mixins.py b/tests/unit/mixins/test_meta_mixins.py
similarity index 100%
rename from gitlab/tests/mixins/test_meta_mixins.py
rename to tests/unit/mixins/test_meta_mixins.py
diff --git a/gitlab/tests/mixins/test_mixin_methods.py b/tests/unit/mixins/test_mixin_methods.py
similarity index 100%
rename from gitlab/tests/mixins/test_mixin_methods.py
rename to tests/unit/mixins/test_mixin_methods.py
diff --git a/gitlab/tests/mixins/test_object_mixins_attributes.py b/tests/unit/mixins/test_object_mixins_attributes.py
similarity index 100%
rename from gitlab/tests/mixins/test_object_mixins_attributes.py
rename to tests/unit/mixins/test_object_mixins_attributes.py
diff --git a/gitlab/tests/objects/__init__.py b/tests/unit/objects/__init__.py
similarity index 100%
rename from gitlab/tests/objects/__init__.py
rename to tests/unit/objects/__init__.py
diff --git a/gitlab/tests/objects/conftest.py b/tests/unit/objects/conftest.py
similarity index 100%
rename from gitlab/tests/objects/conftest.py
rename to tests/unit/objects/conftest.py
diff --git a/gitlab/tests/objects/test_appearance.py b/tests/unit/objects/test_appearance.py
similarity index 100%
rename from gitlab/tests/objects/test_appearance.py
rename to tests/unit/objects/test_appearance.py
diff --git a/gitlab/tests/objects/test_applications.py b/tests/unit/objects/test_applications.py
similarity index 100%
rename from gitlab/tests/objects/test_applications.py
rename to tests/unit/objects/test_applications.py
diff --git a/gitlab/tests/objects/test_audit_events.py b/tests/unit/objects/test_audit_events.py
similarity index 100%
rename from gitlab/tests/objects/test_audit_events.py
rename to tests/unit/objects/test_audit_events.py
diff --git a/gitlab/tests/objects/test_badges.py b/tests/unit/objects/test_badges.py
similarity index 100%
rename from gitlab/tests/objects/test_badges.py
rename to tests/unit/objects/test_badges.py
diff --git a/gitlab/tests/objects/test_bridges.py b/tests/unit/objects/test_bridges.py
similarity index 100%
rename from gitlab/tests/objects/test_bridges.py
rename to tests/unit/objects/test_bridges.py
diff --git a/gitlab/tests/objects/test_commits.py b/tests/unit/objects/test_commits.py
similarity index 100%
rename from gitlab/tests/objects/test_commits.py
rename to tests/unit/objects/test_commits.py
diff --git a/gitlab/tests/objects/test_deploy_tokens.py b/tests/unit/objects/test_deploy_tokens.py
similarity index 100%
rename from gitlab/tests/objects/test_deploy_tokens.py
rename to tests/unit/objects/test_deploy_tokens.py
diff --git a/gitlab/tests/objects/test_deployments.py b/tests/unit/objects/test_deployments.py
similarity index 100%
rename from gitlab/tests/objects/test_deployments.py
rename to tests/unit/objects/test_deployments.py
diff --git a/gitlab/tests/objects/test_environments.py b/tests/unit/objects/test_environments.py
similarity index 100%
rename from gitlab/tests/objects/test_environments.py
rename to tests/unit/objects/test_environments.py
diff --git a/gitlab/tests/objects/test_groups.py b/tests/unit/objects/test_groups.py
similarity index 100%
rename from gitlab/tests/objects/test_groups.py
rename to tests/unit/objects/test_groups.py
diff --git a/gitlab/tests/objects/test_hooks.py b/tests/unit/objects/test_hooks.py
similarity index 100%
rename from gitlab/tests/objects/test_hooks.py
rename to tests/unit/objects/test_hooks.py
diff --git a/gitlab/tests/objects/test_issues.py b/tests/unit/objects/test_issues.py
similarity index 100%
rename from gitlab/tests/objects/test_issues.py
rename to tests/unit/objects/test_issues.py
diff --git a/gitlab/tests/objects/test_job_artifacts.py b/tests/unit/objects/test_job_artifacts.py
similarity index 100%
rename from gitlab/tests/objects/test_job_artifacts.py
rename to tests/unit/objects/test_job_artifacts.py
diff --git a/gitlab/tests/objects/test_jobs.py b/tests/unit/objects/test_jobs.py
similarity index 100%
rename from gitlab/tests/objects/test_jobs.py
rename to tests/unit/objects/test_jobs.py
diff --git a/gitlab/tests/objects/test_members.py b/tests/unit/objects/test_members.py
similarity index 100%
rename from gitlab/tests/objects/test_members.py
rename to tests/unit/objects/test_members.py
diff --git a/gitlab/tests/objects/test_mro.py b/tests/unit/objects/test_mro.py
similarity index 100%
rename from gitlab/tests/objects/test_mro.py
rename to tests/unit/objects/test_mro.py
diff --git a/gitlab/tests/objects/test_packages.py b/tests/unit/objects/test_packages.py
similarity index 100%
rename from gitlab/tests/objects/test_packages.py
rename to tests/unit/objects/test_packages.py
diff --git a/gitlab/tests/objects/test_personal_access_tokens.py b/tests/unit/objects/test_personal_access_tokens.py
similarity index 100%
rename from gitlab/tests/objects/test_personal_access_tokens.py
rename to tests/unit/objects/test_personal_access_tokens.py
diff --git a/gitlab/tests/objects/test_pipeline_schedules.py b/tests/unit/objects/test_pipeline_schedules.py
similarity index 100%
rename from gitlab/tests/objects/test_pipeline_schedules.py
rename to tests/unit/objects/test_pipeline_schedules.py
diff --git a/gitlab/tests/objects/test_pipelines.py b/tests/unit/objects/test_pipelines.py
similarity index 100%
rename from gitlab/tests/objects/test_pipelines.py
rename to tests/unit/objects/test_pipelines.py
diff --git a/gitlab/tests/objects/test_project_access_tokens.py b/tests/unit/objects/test_project_access_tokens.py
similarity index 100%
rename from gitlab/tests/objects/test_project_access_tokens.py
rename to tests/unit/objects/test_project_access_tokens.py
diff --git a/gitlab/tests/objects/test_project_import_export.py b/tests/unit/objects/test_project_import_export.py
similarity index 100%
rename from gitlab/tests/objects/test_project_import_export.py
rename to tests/unit/objects/test_project_import_export.py
diff --git a/gitlab/tests/objects/test_project_merge_request_approvals.py b/tests/unit/objects/test_project_merge_request_approvals.py
similarity index 100%
rename from gitlab/tests/objects/test_project_merge_request_approvals.py
rename to tests/unit/objects/test_project_merge_request_approvals.py
diff --git a/gitlab/tests/objects/test_project_statistics.py b/tests/unit/objects/test_project_statistics.py
similarity index 100%
rename from gitlab/tests/objects/test_project_statistics.py
rename to tests/unit/objects/test_project_statistics.py
diff --git a/gitlab/tests/objects/test_projects.py b/tests/unit/objects/test_projects.py
similarity index 100%
rename from gitlab/tests/objects/test_projects.py
rename to tests/unit/objects/test_projects.py
diff --git a/gitlab/tests/objects/test_releases.py b/tests/unit/objects/test_releases.py
similarity index 100%
rename from gitlab/tests/objects/test_releases.py
rename to tests/unit/objects/test_releases.py
diff --git a/gitlab/tests/objects/test_remote_mirrors.py b/tests/unit/objects/test_remote_mirrors.py
similarity index 100%
rename from gitlab/tests/objects/test_remote_mirrors.py
rename to tests/unit/objects/test_remote_mirrors.py
diff --git a/gitlab/tests/objects/test_repositories.py b/tests/unit/objects/test_repositories.py
similarity index 100%
rename from gitlab/tests/objects/test_repositories.py
rename to tests/unit/objects/test_repositories.py
diff --git a/gitlab/tests/objects/test_resource_label_events.py b/tests/unit/objects/test_resource_label_events.py
similarity index 100%
rename from gitlab/tests/objects/test_resource_label_events.py
rename to tests/unit/objects/test_resource_label_events.py
diff --git a/gitlab/tests/objects/test_resource_milestone_events.py b/tests/unit/objects/test_resource_milestone_events.py
similarity index 100%
rename from gitlab/tests/objects/test_resource_milestone_events.py
rename to tests/unit/objects/test_resource_milestone_events.py
diff --git a/gitlab/tests/objects/test_resource_state_events.py b/tests/unit/objects/test_resource_state_events.py
similarity index 100%
rename from gitlab/tests/objects/test_resource_state_events.py
rename to tests/unit/objects/test_resource_state_events.py
diff --git a/gitlab/tests/objects/test_runners.py b/tests/unit/objects/test_runners.py
similarity index 100%
rename from gitlab/tests/objects/test_runners.py
rename to tests/unit/objects/test_runners.py
diff --git a/gitlab/tests/objects/test_services.py b/tests/unit/objects/test_services.py
similarity index 100%
rename from gitlab/tests/objects/test_services.py
rename to tests/unit/objects/test_services.py
diff --git a/gitlab/tests/objects/test_snippets.py b/tests/unit/objects/test_snippets.py
similarity index 100%
rename from gitlab/tests/objects/test_snippets.py
rename to tests/unit/objects/test_snippets.py
diff --git a/gitlab/tests/objects/test_submodules.py b/tests/unit/objects/test_submodules.py
similarity index 100%
rename from gitlab/tests/objects/test_submodules.py
rename to tests/unit/objects/test_submodules.py
diff --git a/gitlab/tests/objects/test_todos.py b/tests/unit/objects/test_todos.py
similarity index 100%
rename from gitlab/tests/objects/test_todos.py
rename to tests/unit/objects/test_todos.py
diff --git a/gitlab/tests/objects/test_users.py b/tests/unit/objects/test_users.py
similarity index 100%
rename from gitlab/tests/objects/test_users.py
rename to tests/unit/objects/test_users.py
diff --git a/gitlab/tests/objects/test_variables.py b/tests/unit/objects/test_variables.py
similarity index 100%
rename from gitlab/tests/objects/test_variables.py
rename to tests/unit/objects/test_variables.py
diff --git a/gitlab/tests/test_base.py b/tests/unit/test_base.py
similarity index 100%
rename from gitlab/tests/test_base.py
rename to tests/unit/test_base.py
diff --git a/gitlab/tests/test_cli.py b/tests/unit/test_cli.py
similarity index 100%
rename from gitlab/tests/test_cli.py
rename to tests/unit/test_cli.py
diff --git a/gitlab/tests/test_config.py b/tests/unit/test_config.py
similarity index 100%
rename from gitlab/tests/test_config.py
rename to tests/unit/test_config.py
diff --git a/gitlab/tests/test_exceptions.py b/tests/unit/test_exceptions.py
similarity index 100%
rename from gitlab/tests/test_exceptions.py
rename to tests/unit/test_exceptions.py
diff --git a/gitlab/tests/test_gitlab.py b/tests/unit/test_gitlab.py
similarity index 100%
rename from gitlab/tests/test_gitlab.py
rename to tests/unit/test_gitlab.py
diff --git a/gitlab/tests/test_gitlab_auth.py b/tests/unit/test_gitlab_auth.py
similarity index 100%
rename from gitlab/tests/test_gitlab_auth.py
rename to tests/unit/test_gitlab_auth.py
diff --git a/gitlab/tests/test_gitlab_http_methods.py b/tests/unit/test_gitlab_http_methods.py
similarity index 100%
rename from gitlab/tests/test_gitlab_http_methods.py
rename to tests/unit/test_gitlab_http_methods.py
diff --git a/gitlab/tests/test_types.py b/tests/unit/test_types.py
similarity index 100%
rename from gitlab/tests/test_types.py
rename to tests/unit/test_types.py
diff --git a/gitlab/tests/test_utils.py b/tests/unit/test_utils.py
similarity index 100%
rename from gitlab/tests/test_utils.py
rename to tests/unit/test_utils.py
diff --git a/tox.ini b/tox.ini
index a1b1b4259..cbe69e76a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ install_command = pip install {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
-  pytest gitlab/tests {posargs}
+  pytest tests/unit {posargs}
 
 [testenv:pep8]
 basepython = python3
@@ -79,7 +79,7 @@ commands = python setup.py build_sphinx
 [testenv:cover]
 commands =
   pytest --cov --cov-report term --cov-report html \
-    --cov-report xml gitlab/tests {posargs}
+    --cov-report xml tests/unit {posargs}
 
 [coverage:run]
 omit = *tests*