diff --git a/app/core/tests/functional/manufacturer/manufacturer_viewset.py b/app/core/tests/functional/manufacturer/test_manufacturer_metadata.py
similarity index 92%
rename from app/core/tests/functional/manufacturer/manufacturer_viewset.py
rename to app/core/tests/functional/manufacturer/test_manufacturer_metadata.py
index dcccc12d..479fa491 100644
--- a/app/core/tests/functional/manufacturer/manufacturer_viewset.py
+++ b/app/core/tests/functional/manufacturer/test_manufacturer_metadata.py
@@ -1,11 +1,7 @@
 import django
 import pytest
-import unittest
-import requests
 
-
-from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -13,8 +9,6 @@ from access.models.tenant import Tenant as Organization
 from access.models.team import Team
 from access.models.team_user import TeamUsers
 
-from api.tests.abstract.api_permissions_viewset import APIPermissions
-from api.tests.abstract.api_serializer_viewset import SerializersTestCases
 from api.tests.abstract.test_metadata_functional import MetadataAttributesFunctional
 
 from core.models.manufacturer import Manufacturer
@@ -26,6 +20,7 @@ User = django.contrib.auth.get_user_model()
 
 
 
+@pytest.mark.model_manufacturer
 class ViewSetBase:
 
     model = Manufacturer
@@ -220,26 +215,7 @@ class ViewSetBase:
 
 
 
-class ManufacturerPermissionsAPI(
-    ViewSetBase,
-    APIPermissions,
-    TestCase,
-):
-
-    pass
-
-
-
-class ManufacturerViewSet(
-    ViewSetBase,
-    SerializersTestCases,
-    TestCase
-):
-
-    pass
-
-
-
+@pytest.mark.module_core
 class ManufacturerMetadata(
     ViewSetBase,
     MetadataAttributesFunctional,