diff --git a/swh/storage/tests/algos/test_origin.py b/swh/storage/tests/algos/test_origin.py
--- a/swh/storage/tests/algos/test_origin.py
+++ b/swh/storage/tests/algos/test_origin.py
@@ -7,7 +7,7 @@
 
 from unittest.mock import patch
 
-from swh.model.model import Origin, OriginVisit, OriginVisitStatus, Snapshot
+from swh.model.model import Origin, OriginVisit, OriginVisitStatus
 
 from swh.storage.algos.origin import iter_origins, origin_get_latest_visit_status
 from swh.storage.utils import now
@@ -115,12 +115,12 @@
     assert actual_origin_visit is None
 
 
-def init_storage_with_origin_visits(swh_storage):
+def init_storage_with_origin_visits(swh_storage, sample_data_model):
     """Initialize storage with origin/origin-visit/origin-visit-status
 
     """
-    origin1 = Origin.from_dict(data.origin)
-    origin2 = Origin.from_dict(data.origin2)
+    snapshot = sample_data_model["snapshot"][2]
+    origin1, origin2 = sample_data_model["origin"][:2]
     swh_storage.origin_add([origin1, origin2])
 
     ov1, ov2 = swh_storage.origin_visit_add(
@@ -134,7 +134,6 @@
         ]
     )
 
-    snapshot = Snapshot.from_dict(data.complete_snapshot)
     swh_storage.snapshot_add([snapshot])
 
     date_now = now()
@@ -184,11 +183,11 @@
     }
 
 
-def test_origin_get_latest_visit_status_filter_type(swh_storage):
+def test_origin_get_latest_visit_status_filter_type(swh_storage, sample_data_model):
     """Filtering origin visit per types should yield consistent results
 
     """
-    objects = init_storage_with_origin_visits(swh_storage)
+    objects = init_storage_with_origin_visits(swh_storage, sample_data_model)
     origin1, origin2 = objects["origin"]
     ov1, ov2 = objects["origin_visit"]
     ovs11, ovs12, _, ovs22 = objects["origin_visit_status"]
@@ -228,8 +227,8 @@
     assert actual_ovs22 == ovs22
 
 
-def test_origin_get_latest_visit_status_filter_status(swh_storage):
-    objects = init_storage_with_origin_visits(swh_storage)
+def test_origin_get_latest_visit_status_filter_status(swh_storage, sample_data_model):
+    objects = init_storage_with_origin_visits(swh_storage, sample_data_model)
     origin1, origin2 = objects["origin"]
     ov1, ov2 = objects["origin_visit"]
     ovs11, ovs12, _, ovs22 = objects["origin_visit_status"]
@@ -277,8 +276,8 @@
     assert actual_ovs22 == ovs22
 
 
-def test_origin_get_latest_visit_status_filter_snapshot(swh_storage):
-    objects = init_storage_with_origin_visits(swh_storage)
+def test_origin_get_latest_visit_status_filter_snapshot(swh_storage, sample_data_model):
+    objects = init_storage_with_origin_visits(swh_storage, sample_data_model)
     origin1, origin2 = objects["origin"]
     _, ov2 = objects["origin_visit"]
     _, _, _, ovs22 = objects["origin_visit_status"]
diff --git a/swh/storage/tests/storage_data.py b/swh/storage/tests/storage_data.py
--- a/swh/storage/tests/storage_data.py
+++ b/swh/storage/tests/storage_data.py
@@ -18,6 +18,7 @@
     MetadataAuthorityType,
     MetadataFetcher,
     MetadataTargetType,
+    Origin,
     Person,
     RawExtrinsicMetadata,
     Revision,
@@ -332,13 +333,9 @@
     synthetic=False,
 )
 
-origin = {
-    "url": "file:///dev/null",
-}
+origin = Origin(url="file:///dev/null")
 
-origin2 = {
-    "url": "file:///dev/zero",
-}
+origin2 = Origin(url="file:///dev/zero")
 
 origins = (origin, origin2)
 
@@ -369,21 +366,21 @@
 type_visit3 = "deb"
 
 origin_visit = {
-    "origin": origin["url"],
+    "origin": origin.url,
     "visit": 1,
     "date": date_visit1,
     "type": type_visit1,
 }
 
 origin_visit2 = {
-    "origin": origin["url"],
+    "origin": origin.url,
     "visit": 2,
     "date": date_visit2,
     "type": type_visit1,
 }
 
 origin_visit3 = {
-    "origin": origin2["url"],
+    "origin": origin2.url,
     "visit": 1,
     "date": date_visit1,
     "type": type_visit2,
@@ -503,7 +500,7 @@
 content_metadata = RawExtrinsicMetadata(
     type=MetadataTargetType.CONTENT,
     id=parse_swhid(f"swh:1:cnt:{hash_to_hex(content.sha1_git)}"),
-    origin=origin["url"],
+    origin=origin.url,
     discovery_date=datetime.datetime(
         2015, 1, 1, 21, 0, 0, tzinfo=datetime.timezone.utc
     ),
@@ -515,7 +512,7 @@
 content_metadata2 = RawExtrinsicMetadata(
     type=MetadataTargetType.CONTENT,
     id=parse_swhid(f"swh:1:cnt:{hash_to_hex(content.sha1_git)}"),
-    origin=origin2["url"],
+    origin=origin2.url,
     discovery_date=datetime.datetime(
         2017, 1, 1, 22, 0, 0, tzinfo=datetime.timezone.utc
     ),
@@ -534,7 +531,7 @@
     fetcher=attr.evolve(metadata_fetcher2, metadata=None),
     format="yaml",
     metadata=b"foo: bar",
-    origin=origin["url"],
+    origin=origin.url,
     visit=42,
     snapshot=parse_swhid(f"swh:1:snp:{hash_to_hex(snapshot['id'])}"),
     release=parse_swhid(f"swh:1:rel:{hash_to_hex(release['id'])}"),
@@ -545,7 +542,7 @@
 
 origin_metadata = RawExtrinsicMetadata(
     type=MetadataTargetType.ORIGIN,
-    id=origin["url"],
+    id=origin.url,
     discovery_date=datetime.datetime(
         2015, 1, 1, 21, 0, 0, tzinfo=datetime.timezone.utc
     ),
@@ -556,7 +553,7 @@
 )
 origin_metadata2 = RawExtrinsicMetadata(
     type=MetadataTargetType.ORIGIN,
-    id=origin["url"],
+    id=origin.url,
     discovery_date=datetime.datetime(
         2017, 1, 1, 22, 0, 0, tzinfo=datetime.timezone.utc
     ),
@@ -567,7 +564,7 @@
 )
 origin_metadata3 = RawExtrinsicMetadata(
     type=MetadataTargetType.ORIGIN,
-    id=origin["url"],
+    id=origin.url,
     discovery_date=datetime.datetime(
         2017, 1, 1, 22, 0, 0, tzinfo=datetime.timezone.utc
     ),
diff --git a/swh/storage/tests/test_pytest_plugin.py b/swh/storage/tests/test_pytest_plugin.py
--- a/swh/storage/tests/test_pytest_plugin.py
+++ b/swh/storage/tests/test_pytest_plugin.py
@@ -34,6 +34,7 @@
             "skipped_content",
             "directory",
             "revision",
+            "origin",
             "fetcher",
             "authority",
             "origin_metadata",