diff --git a/app/itam/tests/unit/device/device_api_v2.py b/app/itam/tests/unit/device/test_device_api_v2.py
similarity index 100%
rename from app/itam/tests/unit/device/device_api_v2.py
rename to app/itam/tests/unit/device/test_device_api_v2.py
diff --git a/app/itam/tests/unit/device/test_unit_device_model.py b/app/itam/tests/unit/device/test_unit_device_model.py
index a683ffa9..c0c90b85 100644
--- a/app/itam/tests/unit/device/test_unit_device_model.py
+++ b/app/itam/tests/unit/device/test_unit_device_model.py
@@ -9,7 +9,7 @@ from core.tests.unit.centurion_abstract.test_unit_centurion_abstract_model impor
 
 
 
-@pytest.mark.model_gitgroup
+@pytest.mark.model_device
 class DeviceModelTestCases(
     CenturionAbstractModelInheritedCases
 ):
@@ -115,7 +115,7 @@ class DeviceModelInheritedCases(
     pass
 
 
-
+@pytest.mark.module_itam
 class DeviceModelPyTest(
     DeviceModelTestCases,
 ):
diff --git a/app/itam/tests/unit/device/unit_device_viewset.py b/app/itam/tests/unit/device/test_unit_device_viewset.py
similarity index 100%
rename from app/itam/tests/unit/device/unit_device_viewset.py
rename to app/itam/tests/unit/device/test_unit_device_viewset.py