diff --git a/tests/xml/check_coco_v2_support/bad_coco_v2_support_on_sp.xml b/tests/xml/entity-categories/cocov2/bad_cocov2_idp_support_on_sp.xml
similarity index 100%
rename from tests/xml/check_coco_v2_support/bad_coco_v2_support_on_sp.xml
rename to tests/xml/entity-categories/cocov2/bad_cocov2_idp_support_on_sp.xml
diff --git a/tests/xml/check_coco_v2_support/bad_coco_v2_support_on_sp.yaml b/tests/xml/entity-categories/cocov2/bad_cocov2_idp_support_on_sp.yaml
similarity index 100%
rename from tests/xml/check_coco_v2_support/bad_coco_v2_support_on_sp.yaml
rename to tests/xml/entity-categories/cocov2/bad_cocov2_idp_support_on_sp.yaml
diff --git a/tests/xml/check_coco_v2_support/good_coco_v2_support.xml b/tests/xml/entity-categories/cocov2/good_cocov2_idp_support.xml
similarity index 100%
rename from tests/xml/check_coco_v2_support/good_coco_v2_support.xml
rename to tests/xml/entity-categories/cocov2/good_cocov2_idp_support.xml
diff --git a/tests/xml/entity-categories/cocov2/good_sp.xml b/tests/xml/entity-categories/cocov2/good_cocov2_sp.xml
similarity index 100%
rename from tests/xml/entity-categories/cocov2/good_sp.xml
rename to tests/xml/entity-categories/cocov2/good_cocov2_sp.xml
diff --git a/tests/xml/entity-categories/cocov2/good_sp_with_attribute_consuming_service.xml b/tests/xml/entity-categories/cocov2/good_cocov2_sp_with_attribute_consuming_service.xml
similarity index 100%
rename from tests/xml/entity-categories/cocov2/good_sp_with_attribute_consuming_service.xml
rename to tests/xml/entity-categories/cocov2/good_cocov2_sp_with_attribute_consuming_service.xml
diff --git a/tests/xml/entity-categories/cocov2/good_sp_with_subject_identifier.xml b/tests/xml/entity-categories/cocov2/good_cocov2_sp_with_subject_identifier.xml
similarity index 100%
rename from tests/xml/entity-categories/cocov2/good_sp_with_subject_identifier.xml
rename to tests/xml/entity-categories/cocov2/good_cocov2_sp_with_subject_identifier.xml