diff --git a/tests/routes/test_request_details.py b/tests/routes/requests/requests_form/test_details.py
similarity index 100%
rename from tests/routes/test_request_details.py
rename to tests/routes/requests/requests_form/test_details.py
diff --git a/tests/routes/test_request_edit.py b/tests/routes/requests/requests_form/test_edit.py
similarity index 100%
rename from tests/routes/test_request_edit.py
rename to tests/routes/requests/requests_form/test_edit.py
diff --git a/tests/routes/test_request_new.py b/tests/routes/requests/requests_form/test_new.py
similarity index 100%
rename from tests/routes/test_request_new.py
rename to tests/routes/requests/requests_form/test_new.py
diff --git a/tests/routes/test_request_submit.py b/tests/routes/requests/requests_form/test_submit.py
similarity index 100%
rename from tests/routes/test_request_submit.py
rename to tests/routes/requests/requests_form/test_submit.py
diff --git a/tests/routes/test_request_approval.py b/tests/routes/requests/test_approval.py
similarity index 100%
rename from tests/routes/test_request_approval.py
rename to tests/routes/requests/test_approval.py
diff --git a/tests/routes/test_financial_verification.py b/tests/routes/requests/test_financial_verification.py
similarity index 100%
rename from tests/routes/test_financial_verification.py
rename to tests/routes/requests/test_financial_verification.py
diff --git a/tests/routes/test_requests_index.py b/tests/routes/requests/test_requests_index.py
similarity index 100%
rename from tests/routes/test_requests_index.py
rename to tests/routes/requests/test_requests_index.py
diff --git a/tests/routes/workspaces/test_index.py b/tests/routes/workspaces/test_workspaces_index.py
similarity index 100%
rename from tests/routes/workspaces/test_index.py
rename to tests/routes/workspaces/test_workspaces_index.py