diff --git a/src/backend/mailbox_manager/tests/test_command_dimail_setup_db.py b/src/backend/mailbox_manager/tests/commands/test_dimail_setup_db.py
similarity index 100%
rename from src/backend/mailbox_manager/tests/test_command_dimail_setup_db.py
rename to src/backend/mailbox_manager/tests/commands/test_dimail_setup_db.py
diff --git a/src/backend/mailbox_manager/tests/test_models_mailboxes.py b/src/backend/mailbox_manager/tests/models/test_mailboxes.py
similarity index 100%
rename from src/backend/mailbox_manager/tests/test_models_mailboxes.py
rename to src/backend/mailbox_manager/tests/models/test_mailboxes.py
diff --git a/src/backend/mailbox_manager/tests/test_models_maildomain.py b/src/backend/mailbox_manager/tests/models/test_maildomain.py
similarity index 100%
rename from src/backend/mailbox_manager/tests/test_models_maildomain.py
rename to src/backend/mailbox_manager/tests/models/test_maildomain.py
diff --git a/src/backend/mailbox_manager/tests/test_models_maildomainaccess.py b/src/backend/mailbox_manager/tests/models/test_maildomainaccess.py
similarity index 100%
rename from src/backend/mailbox_manager/tests/test_models_maildomainaccess.py
rename to src/backend/mailbox_manager/tests/models/test_maildomainaccess.py