diff --git a/swh/web/tests/api/views/test_snapshot.py b/swh/web/tests/api/views/test_snapshot.py
--- a/swh/web/tests/api/views/test_snapshot.py
+++ b/swh/web/tests/api/views/test_snapshot.py
@@ -23,7 +23,7 @@
 
     assert rv.status_code == 200, rv.data
     assert rv["Content-Type"] == "application/json"
-    expected_data = archive_data.snapshot_get(snapshot)
+    expected_data = {**archive_data.snapshot_get(snapshot), "next_branch": None}
     expected_data = enrich_snapshot(expected_data, rv.wsgi_request)
     assert rv.data == expected_data
 
diff --git a/swh/web/tests/common/test_service.py b/swh/web/tests/common/test_service.py
--- a/swh/web/tests/common/test_service.py
+++ b/swh/web/tests/common/test_service.py
@@ -829,7 +829,7 @@
     expected = archive_data.revision_get(revision)
     assert service.lookup_object(REVISION, revision) == expected
 
-    expected = archive_data.snapshot_get(snapshot)
+    expected = {**archive_data.snapshot_get(snapshot), "next_branch": None}
     assert service.lookup_object(SNAPSHOT, snapshot) == expected
 
 
diff --git a/swh/web/tests/conftest.py b/swh/web/tests/conftest.py
--- a/swh/web/tests/conftest.py
+++ b/swh/web/tests/conftest.py
@@ -22,7 +22,7 @@
 from swh.web.common.typing import OriginVisitInfo
 from swh.web.tests.data import get_tests_data, override_storages
 from swh.storage.algos.origin import origin_get_latest_visit_status
-from swh.storage.algos.snapshot import snapshot_get_latest
+from swh.storage.algos.snapshot import snapshot_get_all_branches, snapshot_get_latest
 
 # Used to skip some tests
 ctags_json_missing = (
@@ -286,8 +286,8 @@
         )
 
     def snapshot_get(self, snapshot_id):
-        snp = self.storage.snapshot_get(hash_to_bytes(snapshot_id))
-        return converters.from_snapshot(snp)
+        snp = snapshot_get_all_branches(self.storage, hash_to_bytes(snapshot_id))
+        return converters.from_snapshot(snp.to_dict())
 
     def snapshot_get_branches(
         self, snapshot_id, branches_from="", branches_count=1000, target_types=None
diff --git a/swh/web/tests/strategies.py b/swh/web/tests/strategies.py
--- a/swh/web/tests/strategies.py
+++ b/swh/web/tests/strategies.py
@@ -460,7 +460,8 @@
     into the test archive.
     """
     return sha1().filter(
-        lambda s: get_tests_data()["storage"].snapshot_get(hash_to_bytes(s)) is None
+        lambda s: get_tests_data()["storage"].snapshot_get_branches(hash_to_bytes(s))
+        is None
     )