diff --git a/tests/test_approvals_api.py b/tests/approval/test_approvals_api.py
similarity index 100%
rename from tests/test_approvals_api.py
rename to tests/approval/test_approvals_api.py
diff --git a/tests/test_approvals_service.py b/tests/approval/test_approvals_service.py
similarity index 100%
rename from tests/test_approvals_service.py
rename to tests/approval/test_approvals_service.py
diff --git a/tests/test_request_approval_script.py b/tests/approval/test_request_approval_script.py
similarity index 100%
rename from tests/test_request_approval_script.py
rename to tests/approval/test_request_approval_script.py
diff --git a/tests/test_file_service.py b/tests/files/test_file_service.py
similarity index 100%
rename from tests/test_file_service.py
rename to tests/files/test_file_service.py
diff --git a/tests/test_files_api.py b/tests/files/test_files_api.py
similarity index 100%
rename from tests/test_files_api.py
rename to tests/files/test_files_api.py
diff --git a/tests/test_study_api.py b/tests/study/test_study_api.py
similarity index 100%
rename from tests/test_study_api.py
rename to tests/study/test_study_api.py
diff --git a/tests/test_study_details_documents.py b/tests/study/test_study_details_documents.py
similarity index 100%
rename from tests/test_study_details_documents.py
rename to tests/study/test_study_details_documents.py
diff --git a/tests/test_study_service.py b/tests/study/test_study_service.py
similarity index 100%
rename from tests/test_study_service.py
rename to tests/study/test_study_service.py
diff --git a/tests/test_update_study_script.py b/tests/study/test_update_study_script.py
similarity index 100%
rename from tests/test_update_study_script.py
rename to tests/study/test_update_study_script.py
diff --git a/tests/test_workflow_processor.py b/tests/workflow/test_workflow_processor.py
similarity index 100%
rename from tests/test_workflow_processor.py
rename to tests/workflow/test_workflow_processor.py
diff --git a/tests/test_workflow_processor_multi_instance.py b/tests/workflow/test_workflow_processor_multi_instance.py
similarity index 100%
rename from tests/test_workflow_processor_multi_instance.py
rename to tests/workflow/test_workflow_processor_multi_instance.py
diff --git a/tests/test_workflow_service.py b/tests/workflow/test_workflow_service.py
similarity index 100%
rename from tests/test_workflow_service.py
rename to tests/workflow/test_workflow_service.py
diff --git a/tests/test_workflow_spec_api.py b/tests/workflow/test_workflow_spec_api.py
similarity index 100%
rename from tests/test_workflow_spec_api.py
rename to tests/workflow/test_workflow_spec_api.py
diff --git a/tests/test_workflow_spec_validation_api.py b/tests/workflow/test_workflow_spec_validation_api.py
similarity index 100%
rename from tests/test_workflow_spec_validation_api.py
rename to tests/workflow/test_workflow_spec_validation_api.py