diff --git a/swh/storage/pytest_plugin.py b/swh/storage/pytest_plugin.py
--- a/swh/storage/pytest_plugin.py
+++ b/swh/storage/pytest_plugin.py
@@ -223,7 +223,7 @@
         "release": [data.release, data.release2, data.release3],
         "snapshot": [data.snapshot, data.empty_snapshot, data.complete_snapshot],
         "origin": data.origins,
-        "origin_visit": [data.origin_visit, data.origin_visit2, data.origin_visit3],
+        "origin_visit": data.origin_visits,
         "fetcher": [data.metadata_fetcher, data.metadata_fetcher2],
         "authority": [data.metadata_authority, data.metadata_authority2],
         "origin_metadata": [
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
@@ -19,6 +19,7 @@
     MetadataFetcher,
     MetadataTargetType,
     Origin,
+    OriginVisit,
     Person,
     RawExtrinsicMetadata,
     Revision,
@@ -369,26 +370,17 @@
 date_visit3 = datetime.datetime(2018, 1, 1, 23, 0, 0, tzinfo=datetime.timezone.utc)
 type_visit3 = "deb"
 
-origin_visit = {
-    "origin": origin.url,
-    "visit": 1,
-    "date": date_visit1,
-    "type": type_visit1,
-}
+origin_visit = OriginVisit(
+    origin=origin.url, visit=1, date=date_visit1, type=type_visit1,
+)
 
-origin_visit2 = {
-    "origin": origin.url,
-    "visit": 2,
-    "date": date_visit2,
-    "type": type_visit1,
-}
+origin_visit2 = OriginVisit(
+    origin=origin.url, visit=2, date=date_visit2, type=type_visit1,
+)
 
-origin_visit3 = {
-    "origin": origin2.url,
-    "visit": 1,
-    "date": date_visit1,
-    "type": type_visit2,
-}
+origin_visit3 = OriginVisit(
+    origin=origin2.url, visit=1, date=date_visit1, type=type_visit2,
+)
 
 origin_visits = [origin_visit, origin_visit2, origin_visit3]
 
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
@@ -35,6 +35,7 @@
             "directory",
             "revision",
             "origin",
+            "origin_visit",
             "fetcher",
             "authority",
             "origin_metadata",