diff --git a/swh/storage/tests/test_retry.py b/swh/storage/tests/test_retry.py
--- a/swh/storage/tests/test_retry.py
+++ b/swh/storage/tests/test_retry.py
@@ -3,12 +3,13 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+from typing import Dict
+from unittest.mock import call
+
 import psycopg2
 import pytest
 
-from typing import Dict
-
-from unittest.mock import call
+from swh.model.model import Content, Origin
 
 from swh.storage import HashCollision, get_storage
 from swh.storage.exc import StorageArgumentException
@@ -70,10 +71,10 @@
     s = swh_storage.content_add([sample_content])
     assert s == {'content:add': 1}
 
-    assert mock_memory.has_calls([
-        call([sample_content]),
-        call([sample_content]),
-        call([sample_content]),
+    mock_memory.assert_has_calls([
+        call([Content.from_dict(sample_content)]),
+        call([Content.from_dict(sample_content)]),
+        call([Content.from_dict(sample_content)]),
     ])
 
 
@@ -139,10 +140,10 @@
     s = swh_storage.content_add_metadata([sample_content])
     assert s == {'content:add': 1}
 
-    assert mock_memory.has_calls([
-        call([sample_content]),
-        call([sample_content]),
-        call([sample_content]),
+    mock_memory.assert_has_calls([
+        call([Content.from_dict(sample_content)]),
+        call([Content.from_dict(sample_content)]),
+        call([Content.from_dict(sample_content)]),
     ])
 
 
@@ -207,10 +208,10 @@
     r = swh_storage.origin_add_one(sample_origin)
     assert r == sample_origin['url']
 
-    assert mock_memory.has_calls([
-        call([sample_origin]),
-        call([sample_origin]),
-        call([sample_origin]),
+    mock_memory.assert_has_calls([
+        call(Origin.from_dict(sample_origin)),
+        call(Origin.from_dict(sample_origin)),
+        call(Origin.from_dict(sample_origin)),
     ])
 
 
@@ -282,7 +283,7 @@
     r = swh_storage.origin_visit_add(sample_origin, '2020-01-01', 'git')
     assert r == {'origin': origin_url, 'visit': 1}
 
-    assert mock_memory.has_calls([
+    mock_memory.assert_has_calls([
         call(sample_origin, '2020-01-01', 'git'),
         call(sample_origin, '2020-01-01', 'git'),
         call(sample_origin, '2020-01-01', 'git')
@@ -307,7 +308,7 @@
     with pytest.raises(StorageArgumentException, match='Refuse to add'):
         swh_storage.origin_visit_add(origin_url, '2020-01-31', 'svn')
 
-    assert mock_memory.has_calls([
+    mock_memory.assert_has_calls([
         call(origin_url, '2020-01-31', 'svn'),
     ])
 
@@ -355,7 +356,7 @@
     tools = swh_storage.tool_add([sample_tool])
     assert tools == [sample_tool]
 
-    assert mock_memory.has_calls([
+    mock_memory.assert_has_calls([
         call([sample_tool]),
         call([sample_tool]),
         call([sample_tool]),
@@ -438,10 +439,13 @@
     provider_id = swh_storage.metadata_provider_add(**provider_get)
     assert provider_id == 'provider_id'
 
-    assert mock_memory.has_calls([
-        call(**provider_get),
-        call(**provider_get),
-        call(**provider_get),
+    provider_arg_names = (
+        'provider_name', 'provider_type', 'provider_url', 'metadata')
+    provider_args = [provider_get[key] for key in provider_arg_names]
+    mock_memory.assert_has_calls([
+        call(*provider_args),
+        call(*provider_args),
+        call(*provider_args),
     ])