diff --git a/tests/test_e2e/test_client.py b/tests/e2e/test_client.py
similarity index 100%
rename from tests/test_e2e/test_client.py
rename to tests/e2e/test_client.py
diff --git a/tests/test_integration/data/workspace_definition/GettingStarted.json b/tests/integration/data/workspace_definition/GettingStarted.json
similarity index 100%
rename from tests/test_integration/data/workspace_definition/GettingStarted.json
rename to tests/integration/data/workspace_definition/GettingStarted.json
diff --git a/tests/test_integration/data/workspace_definition/Trivial.json b/tests/integration/data/workspace_definition/Trivial.json
similarity index 100%
rename from tests/test_integration/data/workspace_definition/Trivial.json
rename to tests/integration/data/workspace_definition/Trivial.json
diff --git a/tests/test_integration/data/workspace_validation/ChildDeploymentNodeNamesAreNotUnique.json b/tests/integration/data/workspace_validation/ChildDeploymentNodeNamesAreNotUnique.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/ChildDeploymentNodeNamesAreNotUnique.json
rename to tests/integration/data/workspace_validation/ChildDeploymentNodeNamesAreNotUnique.json
diff --git a/tests/test_integration/data/workspace_validation/ComponentNamesAreNotUnique.json b/tests/integration/data/workspace_validation/ComponentNamesAreNotUnique.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/ComponentNamesAreNotUnique.json
rename to tests/integration/data/workspace_validation/ComponentNamesAreNotUnique.json
diff --git a/tests/test_integration/data/workspace_validation/ContainerAssociatedWithComponentViewIsMissingFromTheModel.json b/tests/integration/data/workspace_validation/ContainerAssociatedWithComponentViewIsMissingFromTheModel.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/ContainerAssociatedWithComponentViewIsMissingFromTheModel.json
rename to tests/integration/data/workspace_validation/ContainerAssociatedWithComponentViewIsMissingFromTheModel.json
diff --git a/tests/test_integration/data/workspace_validation/ContainerNamesAreNotUnique.json b/tests/integration/data/workspace_validation/ContainerNamesAreNotUnique.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/ContainerNamesAreNotUnique.json
rename to tests/integration/data/workspace_validation/ContainerNamesAreNotUnique.json
diff --git a/tests/test_integration/data/workspace_validation/ElementAssociatedWithDecisionIsMissingFromTheModel.json b/tests/integration/data/workspace_validation/ElementAssociatedWithDecisionIsMissingFromTheModel.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/ElementAssociatedWithDecisionIsMissingFromTheModel.json
rename to tests/integration/data/workspace_validation/ElementAssociatedWithDecisionIsMissingFromTheModel.json
diff --git a/tests/test_integration/data/workspace_validation/ElementAssociatedWithDocumentationSectionIsMissingFromTheModel.json b/tests/integration/data/workspace_validation/ElementAssociatedWithDocumentationSectionIsMissingFromTheModel.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/ElementAssociatedWithDocumentationSectionIsMissingFromTheModel.json
rename to tests/integration/data/workspace_validation/ElementAssociatedWithDocumentationSectionIsMissingFromTheModel.json
diff --git a/tests/test_integration/data/workspace_validation/ElementAssociatedWithDynamicViewIsMissingFromTheModel.json b/tests/integration/data/workspace_validation/ElementAssociatedWithDynamicViewIsMissingFromTheModel.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/ElementAssociatedWithDynamicViewIsMissingFromTheModel.json
rename to tests/integration/data/workspace_validation/ElementAssociatedWithDynamicViewIsMissingFromTheModel.json
diff --git a/tests/test_integration/data/workspace_validation/ElementIdsAreNotUnique.json b/tests/integration/data/workspace_validation/ElementIdsAreNotUnique.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/ElementIdsAreNotUnique.json
rename to tests/integration/data/workspace_validation/ElementIdsAreNotUnique.json
diff --git a/tests/test_integration/data/workspace_validation/ElementReferencedByViewIsMissingFromTheModel.json b/tests/integration/data/workspace_validation/ElementReferencedByViewIsMissingFromTheModel.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/ElementReferencedByViewIsMissingFromTheModel.json
rename to tests/integration/data/workspace_validation/ElementReferencedByViewIsMissingFromTheModel.json
diff --git a/tests/test_integration/data/workspace_validation/PeopleAndSoftwareSystemNamesAreNotUnique.json b/tests/integration/data/workspace_validation/PeopleAndSoftwareSystemNamesAreNotUnique.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/PeopleAndSoftwareSystemNamesAreNotUnique.json
rename to tests/integration/data/workspace_validation/PeopleAndSoftwareSystemNamesAreNotUnique.json
diff --git a/tests/test_integration/data/workspace_validation/RelationshipDescriptionsAreNotUnique.json b/tests/integration/data/workspace_validation/RelationshipDescriptionsAreNotUnique.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/RelationshipDescriptionsAreNotUnique.json
rename to tests/integration/data/workspace_validation/RelationshipDescriptionsAreNotUnique.json
diff --git a/tests/test_integration/data/workspace_validation/RelationshipIdsAreNotUnique.json b/tests/integration/data/workspace_validation/RelationshipIdsAreNotUnique.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/RelationshipIdsAreNotUnique.json
rename to tests/integration/data/workspace_validation/RelationshipIdsAreNotUnique.json
diff --git a/tests/test_integration/data/workspace_validation/RelationshipReferencedByViewIsMissingFromTheModel.json b/tests/integration/data/workspace_validation/RelationshipReferencedByViewIsMissingFromTheModel.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/RelationshipReferencedByViewIsMissingFromTheModel.json
rename to tests/integration/data/workspace_validation/RelationshipReferencedByViewIsMissingFromTheModel.json
diff --git a/tests/test_integration/data/workspace_validation/SoftwareSystemAssociatedWithContainerViewIsMissingFromTheModel.json b/tests/integration/data/workspace_validation/SoftwareSystemAssociatedWithContainerViewIsMissingFromTheModel.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/SoftwareSystemAssociatedWithContainerViewIsMissingFromTheModel.json
rename to tests/integration/data/workspace_validation/SoftwareSystemAssociatedWithContainerViewIsMissingFromTheModel.json
diff --git a/tests/test_integration/data/workspace_validation/SoftwareSystemAssociatedWithDeploymentViewIsMissingFromTheModel.json b/tests/integration/data/workspace_validation/SoftwareSystemAssociatedWithDeploymentViewIsMissingFromTheModel.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/SoftwareSystemAssociatedWithDeploymentViewIsMissingFromTheModel.json
rename to tests/integration/data/workspace_validation/SoftwareSystemAssociatedWithDeploymentViewIsMissingFromTheModel.json
diff --git a/tests/test_integration/data/workspace_validation/SoftwareSystemAssociatedWithSystemContextViewIsMissingFromTheModel.json b/tests/integration/data/workspace_validation/SoftwareSystemAssociatedWithSystemContextViewIsMissingFromTheModel.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/SoftwareSystemAssociatedWithSystemContextViewIsMissingFromTheModel.json
rename to tests/integration/data/workspace_validation/SoftwareSystemAssociatedWithSystemContextViewIsMissingFromTheModel.json
diff --git a/tests/test_integration/data/workspace_validation/TopLevelDeploymentNodeNamesAreNotUnique.json b/tests/integration/data/workspace_validation/TopLevelDeploymentNodeNamesAreNotUnique.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/TopLevelDeploymentNodeNamesAreNotUnique.json
rename to tests/integration/data/workspace_validation/TopLevelDeploymentNodeNamesAreNotUnique.json
diff --git a/tests/test_integration/data/workspace_validation/TopLevelDeploymentNodeNamesAreNotUniqueButTheyExistInDifferentEnvironments.json b/tests/integration/data/workspace_validation/TopLevelDeploymentNodeNamesAreNotUniqueButTheyExistInDifferentEnvironments.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/TopLevelDeploymentNodeNamesAreNotUniqueButTheyExistInDifferentEnvironments.json
rename to tests/integration/data/workspace_validation/TopLevelDeploymentNodeNamesAreNotUniqueButTheyExistInDifferentEnvironments.json
diff --git a/tests/test_integration/data/workspace_validation/ViewAssociatedWithFilteredViewIsMissingFromTheWorkspace.json b/tests/integration/data/workspace_validation/ViewAssociatedWithFilteredViewIsMissingFromTheWorkspace.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/ViewAssociatedWithFilteredViewIsMissingFromTheWorkspace.json
rename to tests/integration/data/workspace_validation/ViewAssociatedWithFilteredViewIsMissingFromTheWorkspace.json
diff --git a/tests/test_integration/data/workspace_validation/ViewKeysAreNotUnique.json b/tests/integration/data/workspace_validation/ViewKeysAreNotUnique.json
similarity index 100%
rename from tests/test_integration/data/workspace_validation/ViewKeysAreNotUnique.json
rename to tests/integration/data/workspace_validation/ViewKeysAreNotUnique.json
diff --git a/tests/test_integration/test_api.py b/tests/integration/test_api.py
similarity index 100%
rename from tests/test_integration/test_api.py
rename to tests/integration/test_api.py
diff --git a/tests/test_integration/test_model_elements.py b/tests/integration/test_model_elements.py
similarity index 100%
rename from tests/test_integration/test_model_elements.py
rename to tests/integration/test_model_elements.py
diff --git a/tests/test_integration/test_workspace_io.py b/tests/integration/test_workspace_io.py
similarity index 100%
rename from tests/test_integration/test_workspace_io.py
rename to tests/integration/test_workspace_io.py
diff --git a/tests/test_unit/api/test_api_response.py b/tests/unit/api/test_api_response.py
similarity index 100%
rename from tests/test_unit/api/test_api_response.py
rename to tests/unit/api/test_api_response.py
diff --git a/tests/test_unit/api/test_structurizr_client.py b/tests/unit/api/test_structurizr_client.py
similarity index 100%
rename from tests/test_unit/api/test_structurizr_client.py
rename to tests/unit/api/test_structurizr_client.py
diff --git a/tests/test_unit/api/test_structurizr_client_settings.py b/tests/unit/api/test_structurizr_client_settings.py
similarity index 100%
rename from tests/test_unit/api/test_structurizr_client_settings.py
rename to tests/unit/api/test_structurizr_client_settings.py
diff --git a/tests/test_unit/model/test_code_element.py b/tests/unit/model/test_code_element.py
similarity index 100%
rename from tests/test_unit/model/test_code_element.py
rename to tests/unit/model/test_code_element.py
diff --git a/tests/test_unit/model/test_code_element_role.py b/tests/unit/model/test_code_element_role.py
similarity index 100%
rename from tests/test_unit/model/test_code_element_role.py
rename to tests/unit/model/test_code_element_role.py
diff --git a/tests/test_unit/model/test_element.py b/tests/unit/model/test_element.py
similarity index 100%
rename from tests/test_unit/model/test_element.py
rename to tests/unit/model/test_element.py
diff --git a/tests/test_unit/model/test_enterprise.py b/tests/unit/model/test_enterprise.py
similarity index 100%
rename from tests/test_unit/model/test_enterprise.py
rename to tests/unit/model/test_enterprise.py
diff --git a/tests/test_unit/model/test_interaction_style.py b/tests/unit/model/test_interaction_style.py
similarity index 100%
rename from tests/test_unit/model/test_interaction_style.py
rename to tests/unit/model/test_interaction_style.py
diff --git a/tests/test_unit/model/test_location.py b/tests/unit/model/test_location.py
similarity index 100%
rename from tests/test_unit/model/test_location.py
rename to tests/unit/model/test_location.py
diff --git a/tests/test_unit/model/test_model_item.py b/tests/unit/model/test_model_item.py
similarity index 100%
rename from tests/test_unit/model/test_model_item.py
rename to tests/unit/model/test_model_item.py
diff --git a/tests/test_unit/model/test_person.py b/tests/unit/model/test_person.py
similarity index 100%
rename from tests/test_unit/model/test_person.py
rename to tests/unit/model/test_person.py
diff --git a/tests/test_unit/model/test_perspective.py b/tests/unit/model/test_perspective.py
similarity index 100%
rename from tests/test_unit/model/test_perspective.py
rename to tests/unit/model/test_perspective.py
diff --git a/tests/test_unit/model/test_relationship.py b/tests/unit/model/test_relationship.py
similarity index 100%
rename from tests/test_unit/model/test_relationship.py
rename to tests/unit/model/test_relationship.py
diff --git a/tests/test_unit/model/test_software_system.py b/tests/unit/model/test_software_system.py
similarity index 100%
rename from tests/test_unit/model/test_software_system.py
rename to tests/unit/model/test_software_system.py
diff --git a/tests/test_unit/test_abstract_base.py b/tests/unit/test_abstract_base.py
similarity index 100%
rename from tests/test_unit/test_abstract_base.py
rename to tests/unit/test_abstract_base.py
diff --git a/tests/test_unit/test_base_model.py b/tests/unit/test_base_model.py
similarity index 100%
rename from tests/test_unit/test_base_model.py
rename to tests/unit/test_base_model.py
diff --git a/tests/test_unit/test_helpers.py b/tests/unit/test_helpers.py
similarity index 100%
rename from tests/test_unit/test_helpers.py
rename to tests/unit/test_helpers.py
diff --git a/tests/test_unit/test_workspace.py b/tests/unit/test_workspace.py
similarity index 100%
rename from tests/test_unit/test_workspace.py
rename to tests/unit/test_workspace.py
diff --git a/tests/test_unit/view/test_color.py b/tests/unit/view/test_color.py
similarity index 100%
rename from tests/test_unit/view/test_color.py
rename to tests/unit/view/test_color.py
diff --git a/tests/test_unit/view/test_paper_size.py b/tests/unit/view/test_paper_size.py
similarity index 100%
rename from tests/test_unit/view/test_paper_size.py
rename to tests/unit/view/test_paper_size.py