diff --git a/app/core/tests/functional/manufacturer/test_manufacturer_serializer.py b/app/core/tests/functional/manufacturer/manufacturer_serializer.py
similarity index 100%
rename from app/core/tests/functional/manufacturer/test_manufacturer_serializer.py
rename to app/core/tests/functional/manufacturer/manufacturer_serializer.py
diff --git a/app/core/tests/functional/manufacturer/test_manufacturer_viewset.py b/app/core/tests/functional/manufacturer/manufacturer_viewset.py
similarity index 100%
rename from app/core/tests/functional/manufacturer/test_manufacturer_viewset.py
rename to app/core/tests/functional/manufacturer/manufacturer_viewset.py
diff --git a/app/core/tests/functional/ticket_category/test_ticket_category_serializer.py b/app/core/tests/functional/ticket_category/ticket_category_serializer.py
similarity index 100%
rename from app/core/tests/functional/ticket_category/test_ticket_category_serializer.py
rename to app/core/tests/functional/ticket_category/ticket_category_serializer.py
diff --git a/app/core/tests/functional/ticket_category/test_ticket_category_viewset.py b/app/core/tests/functional/ticket_category/ticket_category_viewset.py
similarity index 100%
rename from app/core/tests/functional/ticket_category/test_ticket_category_viewset.py
rename to app/core/tests/functional/ticket_category/ticket_category_viewset.py
diff --git a/app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_serializer.py b/app/core/tests/functional/ticket_comment_category/ticket_comment_category_serializer.py
similarity index 100%
rename from app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_serializer.py
rename to app/core/tests/functional/ticket_comment_category/ticket_comment_category_serializer.py
diff --git a/app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_viewset.py b/app/core/tests/functional/ticket_comment_category/ticket_comment_category_viewset.py
similarity index 100%
rename from app/core/tests/functional/ticket_comment_category/test_ticket_comment_category_viewset.py
rename to app/core/tests/functional/ticket_comment_category/ticket_comment_category_viewset.py
diff --git a/app/core/tests/unit/manufacturer/test_manufacturer_api_v2.py b/app/core/tests/unit/manufacturer/manufacturer_api_v2.py
similarity index 100%
rename from app/core/tests/unit/manufacturer/test_manufacturer_api_v2.py
rename to app/core/tests/unit/manufacturer/manufacturer_api_v2.py
diff --git a/app/core/tests/unit/manufacturer/test_unit_manufacturer_model.py b/app/core/tests/unit/manufacturer/unit_manufacturer_model.py
similarity index 100%
rename from app/core/tests/unit/manufacturer/test_unit_manufacturer_model.py
rename to app/core/tests/unit/manufacturer/unit_manufacturer_model.py
diff --git a/app/core/tests/unit/manufacturer/test_unit_manufacturer_viewset.py b/app/core/tests/unit/manufacturer/unit_manufacturer_viewset.py
similarity index 100%
rename from app/core/tests/unit/manufacturer/test_unit_manufacturer_viewset.py
rename to app/core/tests/unit/manufacturer/unit_manufacturer_viewset.py
diff --git a/app/core/tests/unit/ticket_category/test_ticket_category_api_v2.py b/app/core/tests/unit/ticket_category/ticket_category_api_v2.py
similarity index 100%
rename from app/core/tests/unit/ticket_category/test_ticket_category_api_v2.py
rename to app/core/tests/unit/ticket_category/ticket_category_api_v2.py
diff --git a/app/core/tests/unit/ticket_category/test_unit_ticket_category_model.py b/app/core/tests/unit/ticket_category/unit_ticket_category_model.py
similarity index 100%
rename from app/core/tests/unit/ticket_category/test_unit_ticket_category_model.py
rename to app/core/tests/unit/ticket_category/unit_ticket_category_model.py
diff --git a/app/core/tests/unit/ticket_category/test_unit_ticket_category_viewset.py b/app/core/tests/unit/ticket_category/unit_ticket_category_viewset.py
similarity index 100%
rename from app/core/tests/unit/ticket_category/test_unit_ticket_category_viewset.py
rename to app/core/tests/unit/ticket_category/unit_ticket_category_viewset.py
diff --git a/app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_api_v2.py b/app/core/tests/unit/ticket_comment_category/ticket_comment_category_api_v2.py
similarity index 100%
rename from app/core/tests/unit/ticket_comment_category/test_ticket_comment_category_api_v2.py
rename to app/core/tests/unit/ticket_comment_category/ticket_comment_category_api_v2.py
diff --git a/app/core/tests/unit/ticket_comment_category/test_unit_ticket_comment_category_model.py b/app/core/tests/unit/ticket_comment_category/unit_ticket_comment_category_model.py
similarity index 100%
rename from app/core/tests/unit/ticket_comment_category/test_unit_ticket_comment_category_model.py
rename to app/core/tests/unit/ticket_comment_category/unit_ticket_comment_category_model.py
diff --git a/app/core/tests/unit/ticket_comment_category/test_unit_ticket_comment_category_viewset.py b/app/core/tests/unit/ticket_comment_category/unit_ticket_comment_category_viewset.py
similarity index 100%
rename from app/core/tests/unit/ticket_comment_category/test_unit_ticket_comment_category_viewset.py
rename to app/core/tests/unit/ticket_comment_category/unit_ticket_comment_category_viewset.py