diff --git a/swh/journal/tests/test_write_replay.py b/swh/journal/tests/test_write_replay.py
--- a/swh/journal/tests/test_write_replay.py
+++ b/swh/journal/tests/test_write_replay.py
@@ -30,10 +30,8 @@
     for (obj_type, obj) in objects:
         obj = obj.copy()
         if obj_type == 'origin_visit':
-            origin_id = storage1.origin_add_one(obj.pop('origin'))
-            if 'visit' in obj:
-                del obj['visit']
-            storage1.origin_visit_add(origin_id, **obj)
+            storage1.origin_add_one(obj['origin'])
+            storage1.origin_visit_upsert([obj])
         else:
             method = getattr(storage1, obj_type + '_add')
             try: