diff --git a/test/bin/run-tests-docker.sh b/tests/bin/run-tests-docker.sh
similarity index 100%
rename from test/bin/run-tests-docker.sh
rename to tests/bin/run-tests-docker.sh
diff --git a/test/bin/run-tests-ubuntu.sh b/tests/bin/run-tests-ubuntu.sh
similarity index 100%
rename from test/bin/run-tests-ubuntu.sh
rename to tests/bin/run-tests-ubuntu.sh
diff --git a/test/bin/setup-integration-tests-ubuntu.sh b/tests/bin/setup-integration-tests-ubuntu.sh
similarity index 100%
rename from test/bin/setup-integration-tests-ubuntu.sh
rename to tests/bin/setup-integration-tests-ubuntu.sh
diff --git a/test/integration_tests/.npmignore b/tests/integration_tests/.npmignore
similarity index 100%
rename from test/integration_tests/.npmignore
rename to tests/integration_tests/.npmignore
diff --git a/test/integration_tests/abao/abao_test_hooks.js b/tests/integration_tests/abao/abao_test_hooks.js
similarity index 100%
rename from test/integration_tests/abao/abao_test_hooks.js
rename to tests/integration_tests/abao/abao_test_hooks.js
diff --git a/test/integration_tests/abao/load_fixture.py b/tests/integration_tests/abao/load_fixture.py
similarity index 100%
rename from test/integration_tests/abao/load_fixture.py
rename to tests/integration_tests/abao/load_fixture.py
diff --git a/test/integration_tests/abao/test_files/engine-analyses-1.txt b/tests/integration_tests/abao/test_files/engine-analyses-1.txt
similarity index 100%
rename from test/integration_tests/abao/test_files/engine-analyses-1.txt
rename to tests/integration_tests/abao/test_files/engine-analyses-1.txt
diff --git a/test/integration_tests/abao/test_files/notes.txt b/tests/integration_tests/abao/test_files/notes.txt
similarity index 100%
rename from test/integration_tests/abao/test_files/notes.txt
rename to tests/integration_tests/abao/test_files/notes.txt
diff --git a/test/integration_tests/abao/test_files/test-1.dcm b/tests/integration_tests/abao/test_files/test-1.dcm
similarity index 100%
rename from test/integration_tests/abao/test_files/test-1.dcm
rename to tests/integration_tests/abao/test_files/test-1.dcm
diff --git a/test/integration_tests/package.json b/tests/integration_tests/package.json
similarity index 100%
rename from test/integration_tests/package.json
rename to tests/integration_tests/package.json
diff --git a/test/integration_tests/python/conftest.py b/tests/integration_tests/python/conftest.py
similarity index 100%
rename from test/integration_tests/python/conftest.py
rename to tests/integration_tests/python/conftest.py
diff --git a/test/integration_tests/python/test_access_log.py b/tests/integration_tests/python/test_access_log.py
similarity index 100%
rename from test/integration_tests/python/test_access_log.py
rename to tests/integration_tests/python/test_access_log.py
diff --git a/test/integration_tests/python/test_batch.py b/tests/integration_tests/python/test_batch.py
similarity index 100%
rename from test/integration_tests/python/test_batch.py
rename to tests/integration_tests/python/test_batch.py
diff --git a/test/integration_tests/python/test_collection.py b/tests/integration_tests/python/test_collection.py
similarity index 100%
rename from test/integration_tests/python/test_collection.py
rename to tests/integration_tests/python/test_collection.py
diff --git a/test/integration_tests/python/test_containers.py b/tests/integration_tests/python/test_containers.py
similarity index 100%
rename from test/integration_tests/python/test_containers.py
rename to tests/integration_tests/python/test_containers.py
diff --git a/test/integration_tests/python/test_download.py b/tests/integration_tests/python/test_download.py
similarity index 100%
rename from test/integration_tests/python/test_download.py
rename to tests/integration_tests/python/test_download.py
diff --git a/test/integration_tests/python/test_errors.py b/tests/integration_tests/python/test_errors.py
similarity index 100%
rename from test/integration_tests/python/test_errors.py
rename to tests/integration_tests/python/test_errors.py
diff --git a/test/integration_tests/python/test_gears.py b/tests/integration_tests/python/test_gears.py
similarity index 100%
rename from test/integration_tests/python/test_gears.py
rename to tests/integration_tests/python/test_gears.py
diff --git a/test/integration_tests/python/test_groups.py b/tests/integration_tests/python/test_groups.py
similarity index 100%
rename from test/integration_tests/python/test_groups.py
rename to tests/integration_tests/python/test_groups.py
diff --git a/test/integration_tests/python/test_handlers.py b/tests/integration_tests/python/test_handlers.py
similarity index 100%
rename from test/integration_tests/python/test_handlers.py
rename to tests/integration_tests/python/test_handlers.py
diff --git a/test/integration_tests/python/test_jobs.py b/tests/integration_tests/python/test_jobs.py
similarity index 100%
rename from test/integration_tests/python/test_jobs.py
rename to tests/integration_tests/python/test_jobs.py
diff --git a/test/integration_tests/python/test_notes.py b/tests/integration_tests/python/test_notes.py
similarity index 100%
rename from test/integration_tests/python/test_notes.py
rename to tests/integration_tests/python/test_notes.py
diff --git a/test/integration_tests/python/test_permissions.py b/tests/integration_tests/python/test_permissions.py
similarity index 100%
rename from test/integration_tests/python/test_permissions.py
rename to tests/integration_tests/python/test_permissions.py
diff --git a/test/integration_tests/python/test_propagation.py b/tests/integration_tests/python/test_propagation.py
similarity index 100%
rename from test/integration_tests/python/test_propagation.py
rename to tests/integration_tests/python/test_propagation.py
diff --git a/test/integration_tests/python/test_reports.py b/tests/integration_tests/python/test_reports.py
similarity index 100%
rename from test/integration_tests/python/test_reports.py
rename to tests/integration_tests/python/test_reports.py
diff --git a/test/integration_tests/python/test_resolver.py b/tests/integration_tests/python/test_resolver.py
similarity index 100%
rename from test/integration_tests/python/test_resolver.py
rename to tests/integration_tests/python/test_resolver.py
diff --git a/test/integration_tests/python/test_rules.py b/tests/integration_tests/python/test_rules.py
similarity index 100%
rename from test/integration_tests/python/test_rules.py
rename to tests/integration_tests/python/test_rules.py
diff --git a/test/integration_tests/python/test_tags.py b/tests/integration_tests/python/test_tags.py
similarity index 100%
rename from test/integration_tests/python/test_tags.py
rename to tests/integration_tests/python/test_tags.py
diff --git a/test/integration_tests/python/test_uploads.py b/tests/integration_tests/python/test_uploads.py
similarity index 100%
rename from test/integration_tests/python/test_uploads.py
rename to tests/integration_tests/python/test_uploads.py
diff --git a/test/integration_tests/python/test_users.py b/tests/integration_tests/python/test_users.py
similarity index 100%
rename from test/integration_tests/python/test_users.py
rename to tests/integration_tests/python/test_users.py
diff --git a/test/integration_tests/requirements-integration-test.txt b/tests/integration_tests/requirements-integration-test.txt
similarity index 100%
rename from test/integration_tests/requirements-integration-test.txt
rename to tests/integration_tests/requirements-integration-test.txt
diff --git a/test/unit_tests/python/conftest.py b/tests/unit_tests/python/conftest.py
similarity index 100%
rename from test/unit_tests/python/conftest.py
rename to tests/unit_tests/python/conftest.py
diff --git a/test/unit_tests/python/test_auth.py b/tests/unit_tests/python/test_auth.py
similarity index 100%
rename from test/unit_tests/python/test_auth.py
rename to tests/unit_tests/python/test_auth.py
diff --git a/test/unit_tests/python/test_config.py b/tests/unit_tests/python/test_config.py
similarity index 100%
rename from test/unit_tests/python/test_config.py
rename to tests/unit_tests/python/test_config.py
diff --git a/test/unit_tests/python/test_dataexplorer.py b/tests/unit_tests/python/test_dataexplorer.py
similarity index 100%
rename from test/unit_tests/python/test_dataexplorer.py
rename to tests/unit_tests/python/test_dataexplorer.py
diff --git a/test/unit_tests/python/test_db_upgrade.py b/tests/unit_tests/python/test_db_upgrade.py
similarity index 100%
rename from test/unit_tests/python/test_db_upgrade.py
rename to tests/unit_tests/python/test_db_upgrade.py
diff --git a/test/unit_tests/python/test_files.py b/tests/unit_tests/python/test_files.py
similarity index 100%
rename from test/unit_tests/python/test_files.py
rename to tests/unit_tests/python/test_files.py
diff --git a/test/unit_tests/python/test_gear_util.py b/tests/unit_tests/python/test_gear_util.py
similarity index 100%
rename from test/unit_tests/python/test_gear_util.py
rename to tests/unit_tests/python/test_gear_util.py
diff --git a/test/unit_tests/python/test_key.py b/tests/unit_tests/python/test_key.py
similarity index 100%
rename from test/unit_tests/python/test_key.py
rename to tests/unit_tests/python/test_key.py
diff --git a/test/unit_tests/python/test_request.py b/tests/unit_tests/python/test_request.py
similarity index 100%
rename from test/unit_tests/python/test_request.py
rename to tests/unit_tests/python/test_request.py
diff --git a/test/unit_tests/python/test_rules.py b/tests/unit_tests/python/test_rules.py
similarity index 100%
rename from test/unit_tests/python/test_rules.py
rename to tests/unit_tests/python/test_rules.py
diff --git a/test/unit_tests/python/test_util.py b/tests/unit_tests/python/test_util.py
similarity index 100%
rename from test/unit_tests/python/test_util.py
rename to tests/unit_tests/python/test_util.py
diff --git a/test/unit_tests/python/test_validators.py b/tests/unit_tests/python/test_validators.py
similarity index 100%
rename from test/unit_tests/python/test_validators.py
rename to tests/unit_tests/python/test_validators.py
diff --git a/test/unit_tests/python/test_web_start.py b/tests/unit_tests/python/test_web_start.py
similarity index 100%
rename from test/unit_tests/python/test_web_start.py
rename to tests/unit_tests/python/test_web_start.py