diff --git a/swh/web/misc/coverage.py b/swh/web/misc/coverage.py
--- a/swh/web/misc/coverage.py
+++ b/swh/web/misc/coverage.py
@@ -179,6 +179,14 @@
             "search_pattern": "googlecode.com",
             "count": "790,026",
         },
+        {
+            "type": "bitbucket",
+            "info_url": "https://bitbucket.org",
+            "info": "public repositories from Bitbucket",
+            "search_pattern": "https://bitbucket.org/",
+            "visit_types": ["hg"],
+            "count": "336,795",
+        }
     ],
 }
 
diff --git a/swh/web/tests/api/test_apiresponse.py b/swh/web/tests/api/test_apiresponse.py
--- a/swh/web/tests/api/test_apiresponse.py
+++ b/swh/web/tests/api/test_apiresponse.py
@@ -10,7 +10,6 @@
     ACCESS_CONTROL_ALLOW_METHODS,
     ACCESS_CONTROL_ALLOW_ORIGIN,
 )
-from hypothesis import given
 
 from swh.model.swhids import ObjectType
 from swh.web.api.apiresponse import (
@@ -22,7 +21,6 @@
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import reverse
 from swh.web.tests.django_asserts import assert_contains
-from swh.web.tests.strategies import content, directory, revision
 from swh.web.tests.utils import check_http_get_response, check_http_post_response
 
 
@@ -153,7 +151,6 @@
     assert "Traceback" in resp.data["traceback"]
 
 
-@given(content(), directory(), revision())
 def test_api_endpoints_have_cors_headers(client, content, directory, revision):
     url = reverse("api-1-stat-counters")
 
diff --git a/swh/web/tests/api/test_utils.py b/swh/web/tests/api/test_utils.py
--- a/swh/web/tests/api/test_utils.py
+++ b/swh/web/tests/api/test_utils.py
@@ -1,24 +1,14 @@
-# Copyright (C) 2015-2020  The Software Heritage developers
+# Copyright (C) 2015-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import random
 
-from hypothesis import given
-
 from swh.model.hashutil import DEFAULT_ALGORITHMS
 from swh.web.api import utils
 from swh.web.common.origin_visits import get_origin_visits
 from swh.web.common.utils import resolve_branch_alias, reverse
-from swh.web.tests.strategies import (
-    content,
-    directory,
-    origin,
-    release,
-    revision,
-    snapshot,
-)
 
 url_map = [
     {
@@ -107,7 +97,6 @@
     assert actual_release == {}
 
 
-@given(release())
 def test_enrich_release_content_target(api_request_factory, archive_data, release):
 
     release_data = archive_data.release_get(release)
@@ -127,7 +116,6 @@
     assert actual_release == release_data
 
 
-@given(release())
 def test_enrich_release_directory_target(api_request_factory, archive_data, release):
 
     release_data = archive_data.release_get(release)
@@ -147,7 +135,6 @@
     assert actual_release == release_data
 
 
-@given(release())
 def test_enrich_release_revision_target(api_request_factory, archive_data, release):
 
     release_data = archive_data.release_get(release)
@@ -165,7 +152,6 @@
     assert actual_release == release_data
 
 
-@given(release())
 def test_enrich_release_release_target(api_request_factory, archive_data, release):
 
     release_data = archive_data.release_get(release)
@@ -187,7 +173,6 @@
     assert utils.enrich_directory_entry({"id": "dir-id"}) == {"id": "dir-id"}
 
 
-@given(directory())
 def test_enrich_directory_entry_with_type(api_request_factory, archive_data, directory):
 
     dir_content = archive_data.directory_ls(directory)
@@ -227,7 +212,6 @@
     assert utils.enrich_content({"id": "123"}) == {"id": "123"}
 
 
-@given(content())
 def test_enrich_content_with_hashes(api_request_factory, content):
 
     for algo in DEFAULT_ALGORITHMS:
@@ -262,7 +246,6 @@
         assert enriched_content == content_data
 
 
-@given(content())
 def test_enrich_content_with_hashes_and_top_level_url(api_request_factory, content):
 
     for algo in DEFAULT_ALGORITHMS:
@@ -301,7 +284,6 @@
         assert enriched_content == content_data
 
 
-@given(revision())
 def test_enrich_revision_without_children_or_parent(
     api_request_factory, archive_data, revision
 ):
@@ -331,11 +313,10 @@
     assert actual_revision == revision_data
 
 
-@given(revision(), revision(), revision())
 def test_enrich_revision_with_children_and_parent_no_dir(
-    api_request_factory, archive_data, revision, parent_revision, child_revision
+    api_request_factory, archive_data, revisions_list
 ):
-
+    revision, parent_revision, child_revision = revisions_list(size=3)
     revision_data = archive_data.revision_get(revision)
     del revision_data["directory"]
     revision_data["parents"] = revision_data["parents"] + (parent_revision,)
@@ -373,11 +354,8 @@
     assert actual_revision == revision_data
 
 
-@given(revision(), revision(), revision())
-def test_enrich_revision_no_context(
-    api_request_factory, revision, parent_revision, child_revision
-):
-
+def test_enrich_revisionno_context(api_request_factory, revisions_list):
+    revision, parent_revision, child_revision = revisions_list(size=3)
     revision_data = {
         "id": revision,
         "parents": [parent_revision],
@@ -417,11 +395,10 @@
     assert actual_revision == revision_data
 
 
-@given(revision(), revision(), revision())
 def test_enrich_revision_with_no_message(
-    api_request_factory, archive_data, revision, parent_revision, child_revision
+    api_request_factory, archive_data, revisions_list
 ):
-
+    revision, parent_revision, child_revision = revisions_list(size=3)
     revision_data = archive_data.revision_get(revision)
     revision_data["message"] = None
     revision_data["parents"] = revision_data["parents"] + (parent_revision,)
@@ -465,11 +442,10 @@
     assert actual_revision == revision_data
 
 
-@given(revision(), revision(), revision())
 def test_enrich_revision_with_invalid_message(
-    api_request_factory, archive_data, revision, parent_revision, child_revision
+    api_request_factory, archive_data, revisions_list
 ):
-
+    revision, parent_revision, child_revision = revisions_list(size=3)
     revision_data = archive_data.revision_get(revision)
     revision_data["decoding_failures"] = ["message"]
     revision_data["parents"] = revision_data["parents"] + (parent_revision,)
@@ -517,7 +493,6 @@
     assert actual_revision == revision_data
 
 
-@given(snapshot())
 def test_enrich_snapshot(api_request_factory, archive_data, snapshot):
     snapshot_data = archive_data.snapshot_get(snapshot)
 
@@ -548,7 +523,6 @@
     assert actual_snapshot == snapshot_data
 
 
-@given(origin())
 def test_enrich_origin(api_request_factory, origin):
     url = reverse("api-1-origin", url_args={"origin_url": origin["url"]})
     request = api_request_factory.get(url)
@@ -563,7 +537,6 @@
     assert actual_origin == origin_data
 
 
-@given(origin())
 def test_enrich_origin_search_result(api_request_factory, origin):
     url = reverse("api-1-origin-search", url_args={"url_pattern": origin["url"]})
     request = api_request_factory.get(url)
@@ -588,7 +561,6 @@
     )
 
 
-@given(origin())
 def test_enrich_origin_visit(api_request_factory, origin):
 
     origin_visit = random.choice(get_origin_visits(origin))
diff --git a/swh/web/tests/api/views/test_content.py b/swh/web/tests/api/views/test_content.py
--- a/swh/web/tests/api/views/test_content.py
+++ b/swh/web/tests/api/views/test_content.py
@@ -3,13 +3,11 @@
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from hypothesis import given
 import pytest
 
 from swh.web.common.utils import reverse
 from swh.web.tests.conftest import ctags_json_missing, fossology_missing
 from swh.web.tests.data import random_content
-from swh.web.tests.strategies import content, contents_with_ctags
 from swh.web.tests.utils import (
     check_api_get_responses,
     check_api_post_responses,
@@ -17,7 +15,6 @@
 )
 
 
-@given(content())
 def test_api_content_filetype(api_client, indexer_data, content):
     indexer_data.content_add_mimetype(content["sha1"])
     url = reverse(
@@ -68,7 +65,6 @@
 @pytest.mark.skipif(
     ctags_json_missing, reason="requires ctags with json output support"
 )
-@given(contents_with_ctags())
 def test_api_content_symbol(api_client, indexer_data, contents_with_ctags):
     expected_data = {}
     for content_sha1 in contents_with_ctags["sha1s"]:
@@ -136,7 +132,6 @@
 @pytest.mark.skipif(
     ctags_json_missing, reason="requires ctags with json output support"
 )
-@given(content())
 def test_api_content_ctags(api_client, indexer_data, content):
     indexer_data.content_add_ctags(content["sha1"])
     url = reverse(
@@ -155,7 +150,6 @@
 
 
 @pytest.mark.skipif(fossology_missing, reason="requires fossology-nomossa installed")
-@given(content())
 def test_api_content_license(api_client, indexer_data, content):
     indexer_data.content_add_license(content["sha1"])
     url = reverse(
@@ -191,7 +185,6 @@
     }
 
 
-@given(content())
 def test_api_content_metadata(api_client, archive_data, content):
     url = reverse("api-1-content", {"q": "sha1:%s" % content["sha1"]})
     rv = check_api_get_responses(api_client, url, status_code=200)
@@ -236,7 +229,6 @@
     }
 
 
-@given(content())
 def test_api_content_raw_text(api_client, archive_data, content):
     url = reverse("api-1-content-raw", url_args={"q": "sha1:%s" % content["sha1"]})
 
@@ -250,7 +242,6 @@
     assert rv.content == expected_data["data"]
 
 
-@given(content())
 def test_api_content_raw_text_with_filename(api_client, archive_data, content):
     url = reverse(
         "api-1-content-raw",
@@ -264,7 +255,6 @@
     assert rv.content == expected_data["data"]
 
 
-@given(content())
 def test_api_check_content_known(api_client, content):
     url = reverse("api-1-content-known", url_args={"q": content["sha1"]})
     rv = check_api_get_responses(api_client, url, status_code=200)
@@ -274,7 +264,6 @@
     }
 
 
-@given(content())
 def test_api_check_content_known_post(api_client, content):
     url = reverse("api-1-content-known")
     rv = check_api_post_responses(
@@ -298,7 +287,6 @@
     }
 
 
-@given(content())
 def test_api_content_uppercase(api_client, content):
     url = reverse(
         "api-1-content-uppercase-checksum", url_args={"q": content["sha1"].upper()}
diff --git a/swh/web/tests/api/views/test_directory.py b/swh/web/tests/api/views/test_directory.py
--- a/swh/web/tests/api/views/test_directory.py
+++ b/swh/web/tests/api/views/test_directory.py
@@ -5,16 +5,12 @@
 
 import random
 
-from hypothesis import given
-
 from swh.web.api.utils import enrich_directory_entry
 from swh.web.common.utils import reverse
 from swh.web.tests.data import random_sha1
-from swh.web.tests.strategies import directory
 from swh.web.tests.utils import check_api_get_responses, check_http_get_response
 
 
-@given(directory())
 def test_api_directory(api_client, archive_data, directory):
 
     url = reverse("api-1-directory", url_args={"sha1_git": directory})
@@ -39,7 +35,6 @@
     }
 
 
-@given(directory())
 def test_api_directory_with_path_found(api_client, archive_data, directory):
 
     directory_content = archive_data.directory_ls(directory)
@@ -52,7 +47,6 @@
     assert rv.data == enrich_directory_entry(dir_entry, rv.wsgi_request)
 
 
-@given(directory())
 def test_api_directory_with_path_not_found(api_client, directory):
 
     path = "some/path/to/nonexistent/dir/"
@@ -67,7 +61,6 @@
     }
 
 
-@given(directory())
 def test_api_directory_uppercase(api_client, directory):
     url = reverse(
         "api-1-directory-uppercase-checksum", url_args={"sha1_git": directory.upper()}
diff --git a/swh/web/tests/api/views/test_graph.py b/swh/web/tests/api/views/test_graph.py
--- a/swh/web/tests/api/views/test_graph.py
+++ b/swh/web/tests/api/views/test_graph.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2020  The Software Heritage developers
+# Copyright (C) 2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
@@ -7,8 +7,6 @@
 import json
 import textwrap
 
-from hypothesis import given
-
 from django.http.response import StreamingHttpResponse
 
 from swh.model.hashutil import hash_to_bytes
@@ -16,7 +14,6 @@
 from swh.web.api.views.graph import API_GRAPH_PERM
 from swh.web.common.utils import reverse
 from swh.web.config import SWH_WEB_INTERNAL_SERVER_NAME, get_config
-from swh.web.tests.strategies import origin
 from swh.web.tests.utils import check_http_get_response
 
 
@@ -165,7 +162,6 @@
     assert b"".join(resp.streaming_content) == response_ndjson.encode()
 
 
-@given(origin())
 def test_graph_response_resolve_origins(
     archive_data, api_client, keycloak_oidc, requests_mock, origin
 ):
diff --git a/swh/web/tests/api/views/test_identifiers.py b/swh/web/tests/api/views/test_identifiers.py
--- a/swh/web/tests/api/views/test_identifiers.py
+++ b/swh/web/tests/api/views/test_identifiers.py
@@ -3,31 +3,16 @@
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from hypothesis import given
 
 from swh.model.swhids import ObjectType
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import reverse
 from swh.web.tests.data import random_sha1
-from swh.web.tests.strategies import (
-    content,
-    directory,
-    origin,
-    release,
-    revision,
-    snapshot,
-    unknown_content,
-    unknown_directory,
-    unknown_release,
-    unknown_revision,
-    unknown_snapshot,
-)
 from swh.web.tests.utils import check_api_get_responses, check_api_post_responses
 
 
-@given(origin(), content(), directory(), release(), revision(), snapshot())
 def test_swhid_resolve_success(
-    api_client, client, origin, content, directory, release, revision, snapshot
+    api_client, content, directory, origin, release, revision, snapshot
 ):
 
     for obj_type, obj_id in (
@@ -79,13 +64,6 @@
     check_api_get_responses(api_client, url, status_code=400)
 
 
-@given(
-    unknown_content(),
-    unknown_directory(),
-    unknown_release(),
-    unknown_revision(),
-    unknown_snapshot(),
-)
 def test_swhid_resolve_not_found(
     api_client,
     unknown_content,
@@ -116,7 +94,6 @@
     check_api_get_responses(api_client, url, status_code=400)
 
 
-@given(content(), directory(), release(), revision(), snapshot())
 def test_api_known_swhid_all_present(
     api_client, content, directory, release, revision, snapshot
 ):
@@ -135,7 +112,6 @@
     assert resp.data == {swhid: {"known": True} for swhid in input_swhids}
 
 
-@given(content(), directory())
 def test_api_known_swhid_some_present(api_client, content, directory):
     content_ = gen_swhid(ObjectType.CONTENT, content["sha1_git"])
     directory_ = gen_swhid(ObjectType.DIRECTORY, directory)
diff --git a/swh/web/tests/api/views/test_origin.py b/swh/web/tests/api/views/test_origin.py
--- a/swh/web/tests/api/views/test_origin.py
+++ b/swh/web/tests/api/views/test_origin.py
@@ -26,7 +26,7 @@
     ORIGIN_METADATA_KEY,
     ORIGIN_METADATA_VALUE,
 )
-from swh.web.tests.strategies import new_origin, new_snapshots, origin, visit_dates
+from swh.web.tests.strategies import new_origin, new_snapshots, visit_dates
 from swh.web.tests.utils import check_api_get_responses
 
 
@@ -322,7 +322,6 @@
         assert rv.data == expected_visit
 
 
-@given(origin())
 def test_api_lookup_origin_visit_not_found(api_client, origin):
 
     all_visits = list(reversed(get_origin_visits(origin)))
@@ -394,7 +393,6 @@
     assert {origin["url"] for origin in results} == origin_urls
 
 
-@given(origin())
 def test_api_origin_by_url(api_client, archive_data, origin):
     origin_url = origin["url"]
     url = reverse("api-1-origin", url_args={"origin_url": origin_url})
@@ -706,7 +704,6 @@
     oimsft.assert_called_with(conjunction=[ORIGIN_METADATA_VALUE], limit=100)
 
 
-@given(origin())
 def test_api_origin_intrinsic_metadata(api_client, origin):
 
     url = reverse(
diff --git a/swh/web/tests/api/views/test_release.py b/swh/web/tests/api/views/test_release.py
--- a/swh/web/tests/api/views/test_release.py
+++ b/swh/web/tests/api/views/test_release.py
@@ -5,8 +5,6 @@
 
 from datetime import datetime
 
-from hypothesis import given
-
 from swh.model.hashutil import hash_to_bytes, hash_to_hex
 from swh.model.model import (
     ObjectType,
@@ -17,11 +15,9 @@
 )
 from swh.web.common.utils import reverse
 from swh.web.tests.data import random_sha1
-from swh.web.tests.strategies import content, directory, release
 from swh.web.tests.utils import check_api_get_responses, check_http_get_response
 
 
-@given(release())
 def test_api_release(api_client, archive_data, release):
     url = reverse("api-1-release", url_args={"sha1_git": release})
 
@@ -39,7 +35,6 @@
     assert rv.data == expected_release
 
 
-@given(content(), directory(), release())
 def test_api_release_target_type_not_a_revision(
     api_client, archive_data, content, directory, release
 ):
@@ -107,7 +102,6 @@
     }
 
 
-@given(release())
 def test_api_release_uppercase(api_client, release):
     url = reverse(
         "api-1-release-uppercase-checksum", url_args={"sha1_git": release.upper()}
diff --git a/swh/web/tests/api/views/test_revision.py b/swh/web/tests/api/views/test_revision.py
--- a/swh/web/tests/api/views/test_revision.py
+++ b/swh/web/tests/api/views/test_revision.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019  The Software Heritage developers
+# Copyright (C) 2015-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
@@ -17,11 +17,10 @@
 from swh.web.api.utils import enrich_content, enrich_directory_entry, enrich_revision
 from swh.web.common.utils import reverse
 from swh.web.tests.data import random_sha1
-from swh.web.tests.strategies import content, new_person, new_swh_date, revision
+from swh.web.tests.strategies import new_person, new_swh_date
 from swh.web.tests.utils import check_api_get_responses, check_http_get_response
 
 
-@given(revision())
 def test_api_revision(api_client, archive_data, revision):
     url = reverse("api-1-revision", url_args={"sha1_git": revision})
     rv = check_api_get_responses(api_client, url, status_code=200)
@@ -44,7 +43,6 @@
     }
 
 
-@given(revision())
 def test_api_revision_raw_ok(api_client, archive_data, revision):
     url = reverse("api-1-revision-raw-message", url_args={"sha1_git": revision})
 
@@ -68,7 +66,6 @@
     }
 
 
-@given(revision())
 def test_api_revision_log(api_client, archive_data, revision):
     limit = 10
 
@@ -111,7 +108,6 @@
     }
 
 
-@given(revision())
 def test_api_revision_directory_ok_returns_dir_entries(
     api_client, archive_data, revision
 ):
@@ -132,7 +128,7 @@
     }
 
 
-@given(content(), new_person(), new_swh_date())
+@given(new_person(), new_swh_date())
 def test_api_revision_directory_ok_returns_content(
     api_client, archive_data, content, person, date
 ):
@@ -176,7 +172,7 @@
     }
 
 
-@given(revision(), new_person(), new_swh_date())
+@given(new_person(), new_swh_date())
 def test_api_revision_directory_ok_returns_revision(
     api_client, archive_data, revision, person, date
 ):
@@ -220,7 +216,6 @@
     }
 
 
-@given(revision())
 def test_api_revision_uppercase(api_client, revision):
     url = reverse(
         "api-1-revision-uppercase-checksum", url_args={"sha1_git": revision.upper()}
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
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019  The Software Heritage developers
+# Copyright (C) 2018-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
@@ -12,15 +12,10 @@
 from swh.web.api.utils import enrich_snapshot
 from swh.web.common.utils import reverse
 from swh.web.tests.data import random_sha1
-from swh.web.tests.strategies import (
-    new_snapshot,
-    origin_with_pull_request_branches,
-    snapshot,
-)
+from swh.web.tests.strategies import new_snapshot
 from swh.web.tests.utils import check_api_get_responses, check_http_get_response
 
 
-@given(snapshot())
 def test_api_snapshot(api_client, archive_data, snapshot):
 
     url = reverse("api-1-snapshot", url_args={"snapshot_id": snapshot})
@@ -30,7 +25,6 @@
     assert rv.data == expected_data
 
 
-@given(snapshot())
 def test_api_snapshot_paginated(api_client, archive_data, snapshot):
 
     branches_offset = 0
@@ -92,7 +86,6 @@
     assert rv.data == whole_snapshot
 
 
-@given(snapshot())
 def test_api_snapshot_filtered(api_client, archive_data, snapshot):
 
     snapshot_branches = []
@@ -129,7 +122,6 @@
     check_api_get_responses(api_client, url, status_code=404)
 
 
-@given(snapshot())
 def test_api_snapshot_uppercase(api_client, snapshot):
     url = reverse(
         "api-1-snapshot-uppercase-checksum", url_args={"snapshot_id": snapshot.upper()}
@@ -156,13 +148,12 @@
     check_api_get_responses(api_client, url, status_code=200)
 
 
-@given(origin_with_pull_request_branches())
 def test_api_snapshot_no_pull_request_branches_filtering(
-    api_client, archive_data, origin
+    api_client, archive_data, origin_with_pull_request_branches
 ):
     """Pull request branches should not be filtered out when querying
     a snapshot with the Web API."""
-    snapshot = archive_data.snapshot_get_latest(origin.url)
+    snapshot = archive_data.snapshot_get_latest(origin_with_pull_request_branches.url)
     url = reverse("api-1-snapshot", url_args={"snapshot_id": snapshot["id"]})
     resp = check_api_get_responses(api_client, url, status_code=200)
     assert any([b.startswith("refs/pull/") for b in resp.data["branches"]])
diff --git a/swh/web/tests/api/views/test_vault.py b/swh/web/tests/api/views/test_vault.py
--- a/swh/web/tests/api/views/test_vault.py
+++ b/swh/web/tests/api/views/test_vault.py
@@ -5,18 +5,11 @@
 
 import re
 
-from hypothesis import given
 import pytest
 
 from swh.model.swhids import CoreSWHID
 from swh.vault.exc import NotFoundExc
 from swh.web.common.utils import reverse
-from swh.web.tests.strategies import (
-    directory,
-    revision,
-    unknown_directory,
-    unknown_revision,
-)
 from swh.web.tests.utils import (
     check_api_get_responses,
     check_api_post_responses,
@@ -28,7 +21,6 @@
 # Current API:
 
 
-@given(directory(), revision())
 def test_api_vault_cook(api_client, mocker, directory, revision):
     mock_archive = mocker.patch("swh.web.api.views.vault.archive")
 
@@ -78,7 +70,6 @@
         mock_archive.vault_fetch.assert_called_with(bundle_type, swhid)
 
 
-@given(directory(), revision(), unknown_directory(), unknown_revision())
 def test_api_vault_cook_notfound(
     api_client, mocker, directory, revision, unknown_directory, unknown_revision
 ):
@@ -191,7 +182,6 @@
 # Legacy API:
 
 
-@given(directory(), revision())
 def test_api_vault_cook_legacy(api_client, mocker, directory, revision):
     mock_archive = mocker.patch("swh.web.api.views.vault.archive")
 
@@ -243,7 +233,6 @@
         mock_archive.vault_fetch.assert_called_with(bundle_type, swhid)
 
 
-@given(directory(), revision())
 def test_api_vault_cook_uppercase_hash_legacy(api_client, directory, revision):
 
     for obj_type, obj_id in (
@@ -279,7 +268,6 @@
         assert rv["location"] == redirect_url
 
 
-@given(directory(), revision(), unknown_directory(), unknown_revision())
 def test_api_vault_cook_notfound_legacy(
     api_client, mocker, directory, revision, unknown_directory, unknown_revision
 ):
diff --git a/swh/web/tests/browse/test_snapshot_context.py b/swh/web/tests/browse/test_snapshot_context.py
--- a/swh/web/tests/browse/test_snapshot_context.py
+++ b/swh/web/tests/browse/test_snapshot_context.py
@@ -5,8 +5,6 @@
 
 import random
 
-from hypothesis import given
-
 from swh.model.swhids import ObjectType
 from swh.web.browse.snapshot_context import (
     _get_release,
@@ -23,16 +21,10 @@
     SnapshotReleaseInfo,
 )
 from swh.web.common.utils import format_utc_iso_date, reverse
-from swh.web.tests.strategies import (
-    origin_with_multiple_visits,
-    origin_with_releases,
-    snapshot,
-)
 
 
-@given(origin_with_multiple_visits())
-def test_get_origin_visit_snapshot_simple(archive_data, origin):
-    visits = archive_data.origin_visit_get(origin["url"])
+def test_get_origin_visit_snapshot_simple(archive_data, origin_with_multiple_visits):
+    visits = archive_data.origin_visit_get(origin_with_multiple_visits["url"])
 
     for visit in visits:
 
@@ -86,13 +78,12 @@
         assert branches and releases, "Incomplete test data."
 
         origin_visit_branches = get_origin_visit_snapshot(
-            origin, visit_id=visit["visit"]
+            origin_with_multiple_visits, visit_id=visit["visit"]
         )
 
         assert origin_visit_branches == (branches, releases, aliases)
 
 
-@given(snapshot())
 def test_get_snapshot_context_no_origin(archive_data, snapshot):
 
     for browse_context, kwargs in (
@@ -172,20 +163,21 @@
         )
 
 
-@given(origin_with_multiple_visits())
-def test_get_snapshot_context_with_origin(archive_data, origin):
+def test_get_snapshot_context_with_origin(archive_data, origin_with_multiple_visits):
 
-    origin_visits = get_origin_visits(origin)
+    origin_visits = get_origin_visits(origin_with_multiple_visits)
 
     timestamp = format_utc_iso_date(origin_visits[0]["date"], "%Y-%m-%dT%H:%M:%SZ")
     visit_id = origin_visits[1]["visit"]
 
+    origin_url = origin_with_multiple_visits["url"]
+
     for browse_context, kwargs in (
-        ("content", {"origin_url": origin["url"], "path": "/some/path"}),
-        ("directory", {"origin_url": origin["url"]}),
-        ("log", {"origin_url": origin["url"]}),
-        ("directory", {"origin_url": origin["url"], "timestamp": timestamp,},),
-        ("directory", {"origin_url": origin["url"], "visit_id": visit_id,},),
+        ("content", {"origin_url": origin_url, "path": "/some/path"}),
+        ("directory", {"origin_url": origin_url}),
+        ("log", {"origin_url": origin_url}),
+        ("directory", {"origin_url": origin_url, "timestamp": timestamp,},),
+        ("directory", {"origin_url": origin_url, "visit_id": visit_id,},),
     ):
 
         visit_id = kwargs["visit_id"] if "visit_id" in kwargs else None
@@ -243,7 +235,7 @@
             branches=branches,
             branches_url=branches_url,
             is_empty=is_empty,
-            origin_info={"url": origin["url"]},
+            origin_info={"url": origin_url},
             origin_visits_url=origin_visits_url,
             release=None,
             release_alias=False,
@@ -382,9 +374,8 @@
     assert snapshot_context == expected_revision
 
 
-@given(origin_with_releases())
-def test_get_release_large_snapshot(archive_data, origin):
-    snapshot = archive_data.snapshot_get_latest(origin["url"])
+def test_get_release_large_snapshot(archive_data, origin_with_releases):
+    snapshot = archive_data.snapshot_get_latest(origin_with_releases["url"])
     release_id = random.choice(
         [
             v["target"]
diff --git a/swh/web/tests/browse/views/test_content.py b/swh/web/tests/browse/views/test_content.py
--- a/swh/web/tests/browse/views/test_content.py
+++ b/swh/web/tests/browse/views/test_content.py
@@ -5,8 +5,6 @@
 
 import random
 
-from hypothesis import given
-
 from django.utils.html import escape
 
 from swh.model.swhids import ObjectType
@@ -20,39 +18,27 @@
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import gen_path_info, reverse
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
-from swh.web.tests.strategies import (
-    content,
-    content_application_no_highlight,
-    content_image_type,
-    content_text,
-    content_text_no_highlight,
-    content_text_non_utf8,
-    content_unsupported_image_type_rendering,
-    content_utf8_detected_as_binary,
-    invalid_sha1,
-    origin_with_multiple_visits,
-    unknown_content,
-)
 from swh.web.tests.utils import check_html_get_response, check_http_get_response
 
 
-@given(content_text())
-def test_content_view_text(client, archive_data, content):
-    sha1_git = content["sha1_git"]
+def test_content_view_text(client, archive_data, content_text):
+    sha1_git = content_text["sha1_git"]
 
     url = reverse(
         "browse-content",
-        url_args={"query_string": content["sha1"]},
-        query_params={"path": content["path"]},
+        url_args={"query_string": content_text["sha1"]},
+        query_params={"path": content_text["path"]},
     )
 
-    url_raw = reverse("browse-content-raw", url_args={"query_string": content["sha1"]})
+    url_raw = reverse(
+        "browse-content-raw", url_args={"query_string": content_text["sha1"]}
+    )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
-    content_display = _process_content_for_display(archive_data, content)
+    content_display = _process_content_for_display(archive_data, content_text)
     mimetype = content_display["mimetype"]
 
     if mimetype.startswith("text/"):
@@ -67,9 +53,10 @@
     assert_not_contains(resp, "swh-metadata-popover")
 
 
-@given(content_application_no_highlight(), content_text_no_highlight())
-def test_content_view_no_highlight(client, archive_data, content_app, content_text):
-    for content_ in (content_app, content_text):
+def test_content_view_no_highlight(
+    client, archive_data, content_application_no_highlight, content_text_no_highlight
+):
+    for content_ in (content_application_no_highlight, content_text_no_highlight):
         content = content_
         sha1_git = content["sha1_git"]
 
@@ -96,17 +83,18 @@
         assert_contains(resp, swh_cnt_id_url)
 
 
-@given(content_text_non_utf8())
-def test_content_view_no_utf8_text(client, archive_data, content):
-    sha1_git = content["sha1_git"]
+def test_content_view_no_utf8_text(client, archive_data, content_text_non_utf8):
+    sha1_git = content_text_non_utf8["sha1_git"]
 
-    url = reverse("browse-content", url_args={"query_string": content["sha1"]})
+    url = reverse(
+        "browse-content", url_args={"query_string": content_text_non_utf8["sha1"]}
+    )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
-    content_display = _process_content_for_display(archive_data, content)
+    content_display = _process_content_for_display(archive_data, content_text_non_utf8)
 
     swh_cnt_id = gen_swhid(ObjectType.CONTENT, sha1_git)
     swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
@@ -114,33 +102,40 @@
     assert_contains(resp, escape(content_display["content_data"]))
 
 
-@given(content_image_type())
-def test_content_view_image(client, archive_data, content):
-    url = reverse("browse-content", url_args={"query_string": content["sha1"]})
+def test_content_view_image(client, archive_data, content_image_type):
+    url = reverse(
+        "browse-content", url_args={"query_string": content_image_type["sha1"]}
+    )
 
-    url_raw = reverse("browse-content-raw", url_args={"query_string": content["sha1"]})
+    url_raw = reverse(
+        "browse-content-raw", url_args={"query_string": content_image_type["sha1"]}
+    )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
-    content_display = _process_content_for_display(archive_data, content)
+    content_display = _process_content_for_display(archive_data, content_image_type)
     mimetype = content_display["mimetype"]
     content_data = content_display["content_data"]
     assert_contains(resp, '<img src="data:%s;base64,%s"/>' % (mimetype, content_data))
     assert_contains(resp, url_raw)
 
 
-@given(content_unsupported_image_type_rendering())
-def test_content_view_image_no_rendering(client, archive_data, content):
-    url = reverse("browse-content", url_args={"query_string": content["sha1"]})
+def test_content_view_image_no_rendering(
+    client, archive_data, content_unsupported_image_type_rendering
+):
+    url = reverse(
+        "browse-content",
+        url_args={"query_string": content_unsupported_image_type_rendering["sha1"]},
+    )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
-    mimetype = content["mimetype"]
-    encoding = content["encoding"]
+    mimetype = content_unsupported_image_type_rendering["mimetype"]
+    encoding = content_unsupported_image_type_rendering["encoding"]
     assert_contains(
         resp,
         (
@@ -150,13 +145,12 @@
     )
 
 
-@given(content_text())
-def test_content_view_text_with_path(client, archive_data, content):
-    path = content["path"]
+def test_content_view_text_with_path(client, archive_data, content_text):
+    path = content_text["path"]
 
     url = reverse(
         "browse-content",
-        url_args={"query_string": content["sha1"]},
+        url_args={"query_string": content_text["sha1"]},
         query_params={"path": path},
     )
 
@@ -166,11 +160,11 @@
 
     assert_contains(resp, '<nav class="bread-crumbs')
 
-    content_display = _process_content_for_display(archive_data, content)
+    content_display = _process_content_for_display(archive_data, content_text)
     mimetype = content_display["mimetype"]
 
     if mimetype.startswith("text/"):
-        hljs_language = content["hljs_language"]
+        hljs_language = content_text["hljs_language"]
         assert_contains(resp, '<code class="%s">' % hljs_language)
         assert_contains(resp, escape(content_display["content_data"]))
 
@@ -186,7 +180,7 @@
     }
 
     swh_cnt_id = gen_swhid(
-        ObjectType.CONTENT, content["sha1_git"], metadata=swhid_context
+        ObjectType.CONTENT, content_text["sha1_git"], metadata=swhid_context
     )
     swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
     assert_contains(resp, swh_cnt_id)
@@ -214,14 +208,14 @@
 
     url_raw = reverse(
         "browse-content-raw",
-        url_args={"query_string": content["sha1"]},
+        url_args={"query_string": content_text["sha1"]},
         query_params={"filename": filename},
     )
     assert_contains(resp, url_raw)
 
     url = reverse(
         "browse-content",
-        url_args={"query_string": content["sha1"]},
+        url_args={"query_string": content_text["sha1"]},
         query_params={"path": filename},
     )
 
@@ -234,7 +228,7 @@
     invalid_path = "%s/foo/bar/baz" % root_dir_sha1
     url = reverse(
         "browse-content",
-        url_args={"query_string": content["sha1"]},
+        url_args={"query_string": content_text["sha1"]},
         query_params={"path": invalid_path},
     )
 
@@ -243,25 +237,26 @@
     )
 
 
-@given(content_text())
-def test_content_raw_text(client, archive_data, content):
-    url = reverse("browse-content-raw", url_args={"query_string": content["sha1"]})
+def test_content_raw_text(client, archive_data, content_text):
+    url = reverse("browse-content-raw", url_args={"query_string": content_text["sha1"]})
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="text/plain"
     )
 
-    content_data = archive_data.content_get_data(content["sha1"])["data"]
+    content_data = archive_data.content_get_data(content_text["sha1"])["data"]
 
     assert resp["Content-Type"] == "text/plain"
-    assert resp["Content-disposition"] == ("filename=%s_%s" % ("sha1", content["sha1"]))
+    assert resp["Content-disposition"] == (
+        "filename=%s_%s" % ("sha1", content_text["sha1"])
+    )
     assert resp.content == content_data
 
-    filename = content["path"].split("/")[-1]
+    filename = content_text["path"].split("/")[-1]
 
     url = reverse(
         "browse-content-raw",
-        url_args={"query_string": content["sha1"]},
+        url_args={"query_string": content_text["sha1"]},
         query_params={"filename": filename},
     )
 
@@ -274,38 +269,40 @@
     assert resp.content == content_data
 
 
-@given(content_text_non_utf8())
-def test_content_raw_no_utf8_text(client, content):
-    url = reverse("browse-content-raw", url_args={"query_string": content["sha1"]})
+def test_content_raw_no_utf8_text(client, content_text_non_utf8):
+    url = reverse(
+        "browse-content-raw", url_args={"query_string": content_text_non_utf8["sha1"]}
+    )
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="text/plain"
     )
     _, encoding = get_mimetype_and_encoding_for_content(resp.content)
-    assert encoding == content["encoding"]
+    assert encoding == content_text_non_utf8["encoding"]
 
 
-@given(content_image_type())
-def test_content_raw_bin(client, archive_data, content):
-    url = reverse("browse-content-raw", url_args={"query_string": content["sha1"]})
+def test_content_raw_bin(client, archive_data, content_image_type):
+    url = reverse(
+        "browse-content-raw", url_args={"query_string": content_image_type["sha1"]}
+    )
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="application/octet-stream"
     )
 
-    filename = content["path"].split("/")[-1]
-    content_data = archive_data.content_get_data(content["sha1"])["data"]
+    filename = content_image_type["path"].split("/")[-1]
+    content_data = archive_data.content_get_data(content_image_type["sha1"])["data"]
 
     assert resp["Content-Type"] == "application/octet-stream"
     assert resp["Content-disposition"] == "attachment; filename=%s_%s" % (
         "sha1",
-        content["sha1"],
+        content_image_type["sha1"],
     )
     assert resp.content == content_data
 
     url = reverse(
         "browse-content-raw",
-        url_args={"query_string": content["sha1"]},
+        url_args={"query_string": content_image_type["sha1"]},
         query_params={"filename": filename},
     )
 
@@ -318,7 +315,6 @@
     assert resp.content == content_data
 
 
-@given(invalid_sha1(), unknown_content())
 def test_content_request_errors(client, invalid_sha1, unknown_content):
     url = reverse("browse-content", url_args={"query_string": invalid_sha1})
     check_html_get_response(client, url, status_code=400, template_used="error.html")
@@ -329,7 +325,6 @@
     )
 
 
-@given(content())
 def test_content_bytes_missing(client, archive_data, mocker, content):
     mock_archive = mocker.patch("swh.web.browse.utils.archive")
     content_data = archive_data.content_get(content["sha1"])
@@ -387,7 +382,6 @@
     assert_contains(resp, url_raw)
 
 
-@given(content())
 def test_content_uppercase(client, content):
     url = reverse(
         "browse-content-uppercase-checksum",
@@ -401,22 +395,30 @@
     assert resp["location"] == redirect_url
 
 
-@given(content_utf8_detected_as_binary())
-def test_content_utf8_detected_as_binary_display(client, archive_data, content):
-    url = reverse("browse-content", url_args={"query_string": content["sha1"]})
+def test_content_utf8_detected_as_binary_display(
+    client, archive_data, content_utf8_detected_as_binary
+):
+    url = reverse(
+        "browse-content",
+        url_args={"query_string": content_utf8_detected_as_binary["sha1"]},
+    )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/content.html"
     )
 
-    content_display = _process_content_for_display(archive_data, content)
+    content_display = _process_content_for_display(
+        archive_data, content_utf8_detected_as_binary
+    )
 
     assert_contains(resp, escape(content_display["content_data"]))
 
 
-@given(origin_with_multiple_visits())
-def test_content_origin_snapshot_branch_browse(client, archive_data, origin):
-    visits = archive_data.origin_visit_get(origin["url"])
+def test_content_origin_snapshot_branch_browse(
+    client, archive_data, origin_with_multiple_visits
+):
+    origin_url = origin_with_multiple_visits["url"]
+    visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
@@ -433,7 +435,7 @@
         "browse-content",
         url_args={"query_string": directory_file["checksums"]["sha1"]},
         query_params={
-            "origin_url": origin["url"],
+            "origin_url": origin_with_multiple_visits["url"],
             "snapshot": snapshot["id"],
             "branch": branch_info["name"],
             "path": directory_file["name"],
@@ -445,7 +447,7 @@
     )
 
     _check_origin_snapshot_related_html(
-        resp, origin, snapshot, snapshot_sizes, branches, releases
+        resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_file["name"])
     assert_contains(resp, f"Branch: <strong>{branch_info['name']}</strong>")
@@ -454,7 +456,7 @@
         ObjectType.CONTENT,
         directory_file["checksums"]["sha1_git"],
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.REVISION, branch_info["revision"]),
             "path": f"/{directory_file['name']}",
@@ -466,7 +468,7 @@
         ObjectType.DIRECTORY,
         directory,
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.REVISION, branch_info["revision"]),
         },
@@ -477,21 +479,23 @@
         ObjectType.REVISION,
         branch_info["revision"],
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rev_swhid)
 
     snp_swhid = gen_swhid(
-        ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin["url"],},
+        ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin_url,},
     )
     assert_contains(resp, snp_swhid)
 
 
-@given(origin_with_multiple_visits())
-def test_content_origin_snapshot_release_browse(client, archive_data, origin):
-    visits = archive_data.origin_visit_get(origin["url"])
+def test_content_origin_snapshot_release_browse(
+    client, archive_data, origin_with_multiple_visits
+):
+    origin_url = origin_with_multiple_visits["url"]
+    visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
@@ -507,7 +511,7 @@
         "browse-content",
         url_args={"query_string": directory_file["checksums"]["sha1"]},
         query_params={
-            "origin_url": origin["url"],
+            "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "release": release_info["name"],
             "path": directory_file["name"],
@@ -519,7 +523,7 @@
     )
 
     _check_origin_snapshot_related_html(
-        resp, origin, snapshot, snapshot_sizes, branches, releases
+        resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_file["name"])
     assert_contains(resp, f"Release: <strong>{release_info['name']}</strong>")
@@ -528,7 +532,7 @@
         ObjectType.CONTENT,
         directory_file["checksums"]["sha1_git"],
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.RELEASE, release_info["id"]),
             "path": f"/{directory_file['name']}",
@@ -540,7 +544,7 @@
         ObjectType.DIRECTORY,
         release_info["directory"],
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.RELEASE, release_info["id"]),
         },
@@ -551,7 +555,7 @@
         ObjectType.REVISION,
         release_info["target"],
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
@@ -561,14 +565,14 @@
         ObjectType.RELEASE,
         release_info["id"],
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rel_swhid)
 
     snp_swhid = gen_swhid(
-        ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin["url"],},
+        ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin_url,},
     )
     assert_contains(resp, snp_swhid)
 
diff --git a/swh/web/tests/browse/views/test_directory.py b/swh/web/tests/browse/views/test_directory.py
--- a/swh/web/tests/browse/views/test_directory.py
+++ b/swh/web/tests/browse/views/test_directory.py
@@ -30,33 +30,24 @@
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import gen_path_info, reverse
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
-from swh.web.tests.strategies import (
-    directory,
-    directory_with_subdirs,
-    empty_directory,
-    invalid_sha1,
-    new_person,
-    new_swh_date,
-    origin_with_multiple_visits,
-    unknown_directory,
-)
+from swh.web.tests.strategies import new_person, new_swh_date
 from swh.web.tests.utils import check_html_get_response
 
 
-@given(directory())
 def test_root_directory_view(client, archive_data, directory):
     _directory_view_checks(client, directory, archive_data.directory_ls(directory))
 
 
-@given(directory_with_subdirs())
-def test_sub_directory_view(client, archive_data, directory):
-    dir_content = archive_data.directory_ls(directory)
+def test_sub_directory_view(client, archive_data, directory_with_subdirs):
+    dir_content = archive_data.directory_ls(directory_with_subdirs)
     subdir = random.choice([e for e in dir_content if e["type"] == "dir"])
     subdir_content = archive_data.directory_ls(subdir["target"])
-    _directory_view_checks(client, directory, subdir_content, subdir["name"])
+    _directory_view_checks(
+        client, directory_with_subdirs, subdir_content, subdir["name"]
+    )
 
 
-@given(empty_directory(), new_person(), new_swh_date())
+@given(new_person(), new_swh_date())
 def test_sub_directory_view_origin_context(
     client, archive_data, empty_directory, person, date
 ):
@@ -138,7 +129,6 @@
     )
 
 
-@given(invalid_sha1(), unknown_directory())
 def test_directory_request_errors(client, invalid_sha1, unknown_directory):
     dir_url = reverse("browse-directory", url_args={"sha1_git": invalid_sha1})
 
@@ -153,7 +143,6 @@
     )
 
 
-@given(directory())
 def test_directory_with_invalid_path(client, directory):
     path = "foo/bar"
     dir_url = reverse(
@@ -171,7 +160,6 @@
     assert_contains(resp, error_message, status_code=404)
 
 
-@given(directory())
 def test_directory_uppercase(client, directory):
     url = reverse(
         "browse-directory-uppercase-checksum", url_args={"sha1_git": directory.upper()}
@@ -184,7 +172,6 @@
     assert resp["location"] == redirect_url
 
 
-@given(directory())
 def test_permalink_box_context(client, tests_data, directory):
     origin_url = random.choice(tests_data["origins"])["url"]
     url = reverse(
@@ -199,9 +186,11 @@
     assert_contains(resp, 'id="swhid-context-option-directory"')
 
 
-@given(origin_with_multiple_visits())
-def test_directory_origin_snapshot_branch_browse(client, archive_data, origin):
-    visits = archive_data.origin_visit_get(origin["url"])
+def test_directory_origin_snapshot_branch_browse(
+    client, archive_data, origin_with_multiple_visits
+):
+    origin_url = origin_with_multiple_visits["url"]
+    visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
@@ -218,7 +207,7 @@
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={
-            "origin_url": origin["url"],
+            "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "branch": branch_info["name"],
             "path": directory_subdir["name"],
@@ -230,7 +219,7 @@
     )
 
     _check_origin_snapshot_related_html(
-        resp, origin, snapshot, snapshot_sizes, branches, releases
+        resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_subdir["name"])
     assert_contains(resp, f"Branch: <strong>{branch_info['name']}</strong>")
@@ -239,7 +228,7 @@
         ObjectType.DIRECTORY,
         directory_subdir["target"],
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.REVISION, branch_info["revision"]),
             "path": "/",
@@ -251,21 +240,23 @@
         ObjectType.REVISION,
         branch_info["revision"],
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rev_swhid)
 
     snp_swhid = gen_swhid(
-        ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin["url"],},
+        ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin_url,},
     )
     assert_contains(resp, snp_swhid)
 
 
-@given(origin_with_multiple_visits())
-def test_drectory_origin_snapshot_release_browse(client, archive_data, origin):
-    visits = archive_data.origin_visit_get(origin["url"])
+def test_drectory_origin_snapshot_release_browse(
+    client, archive_data, origin_with_multiple_visits
+):
+    origin_url = origin_with_multiple_visits["url"]
+    visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
@@ -282,7 +273,7 @@
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={
-            "origin_url": origin["url"],
+            "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "release": release_info["name"],
             "path": directory_subdir["name"],
@@ -294,7 +285,7 @@
     )
 
     _check_origin_snapshot_related_html(
-        resp, origin, snapshot, snapshot_sizes, branches, releases
+        resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_subdir["name"])
     assert_contains(resp, f"Release: <strong>{release_info['name']}</strong>")
@@ -303,7 +294,7 @@
         ObjectType.DIRECTORY,
         directory_subdir["target"],
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.RELEASE, release_info["id"]),
             "path": "/",
@@ -315,7 +306,7 @@
         ObjectType.REVISION,
         release_info["target"],
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
@@ -325,21 +316,23 @@
         ObjectType.RELEASE,
         release_info["id"],
         metadata={
-            "origin": origin["url"],
+            "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rel_swhid)
 
     snp_swhid = gen_swhid(
-        ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin["url"],},
+        ObjectType.SNAPSHOT, snapshot["id"], metadata={"origin": origin_url,},
     )
     assert_contains(resp, snp_swhid)
 
 
-@given(origin_with_multiple_visits())
-def test_directory_origin_snapshot_revision_browse(client, archive_data, origin):
-    visits = archive_data.origin_visit_get(origin["url"])
+def test_directory_origin_snapshot_revision_browse(
+    client, archive_data, origin_with_multiple_visits
+):
+    origin_url = origin_with_multiple_visits["url"]
+    visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     branches, releases, _ = process_snapshot_branches(snapshot)
@@ -355,7 +348,7 @@
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={
-            "origin_url": origin["url"],
+            "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "revision": branch_info["revision"],
             "path": directory_subdir["name"],
diff --git a/swh/web/tests/browse/views/test_identifiers.py b/swh/web/tests/browse/views/test_identifiers.py
--- a/swh/web/tests/browse/views/test_identifiers.py
+++ b/swh/web/tests/browse/views/test_identifiers.py
@@ -6,25 +6,14 @@
 import random
 from urllib.parse import quote
 
-from hypothesis import given
-
 from swh.model.model import Origin
 from swh.model.swhids import ObjectType
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import reverse
 from swh.web.tests.django_asserts import assert_contains
-from swh.web.tests.strategies import (
-    content,
-    directory,
-    origin,
-    release,
-    revision,
-    snapshot,
-)
 from swh.web.tests.utils import check_html_get_response
 
 
-@given(content())
 def test_content_id_browse(client, content):
     cnt_sha1_git = content["sha1_git"]
     swhid = gen_swhid(ObjectType.CONTENT, cnt_sha1_git)
@@ -41,7 +30,6 @@
         assert resp["location"] == content_browse_url
 
 
-@given(directory())
 def test_directory_id_browse(client, directory):
     swhid = gen_swhid(ObjectType.DIRECTORY, directory)
 
@@ -56,7 +44,6 @@
         assert resp["location"] == directory_browse_url
 
 
-@given(revision())
 def test_revision_id_browse(client, revision):
     swhid = gen_swhid(ObjectType.REVISION, revision)
 
@@ -85,7 +72,6 @@
         assert resp["location"] == revision_browse_url
 
 
-@given(release())
 def test_release_id_browse(client, release):
     swhid = gen_swhid(ObjectType.RELEASE, release)
 
@@ -111,7 +97,6 @@
         assert resp["location"] == release_browse_url
 
 
-@given(snapshot())
 def test_snapshot_id_browse(client, snapshot):
     swhid = gen_swhid(ObjectType.SNAPSHOT, snapshot)
 
@@ -141,7 +126,6 @@
         assert resp["location"] == release_browse_url
 
 
-@given(release())
 def test_bad_id_browse(client, release):
     swhid = f"swh:1:foo:{release}"
     url = reverse("browse-swhid", url_args={"swhid": swhid})
@@ -149,7 +133,6 @@
     check_html_get_response(client, url, status_code=400)
 
 
-@given(content())
 def test_content_id_optional_parts_browse(client, archive_data, content):
     cnt_sha1_git = content["sha1_git"]
     origin_url = "https://github.com/user/repo"
@@ -175,7 +158,6 @@
     assert resp["location"] == content_browse_url
 
 
-@given(release())
 def test_origin_id_not_resolvable(client, release):
     swhid = "swh:1:ori:8068d0075010b590762c6cb5682ed53cb3c13deb"
     url = reverse("browse-swhid", url_args={"swhid": swhid})
@@ -183,7 +165,6 @@
     check_html_get_response(client, url, status_code=400)
 
 
-@given(origin())
 def test_legacy_swhid_browse(archive_data, client, origin):
     snapshot = archive_data.snapshot_get_latest(origin["url"])
     revision = archive_data.snapshot_get_head(snapshot)
@@ -228,7 +209,6 @@
     assert_contains(resp, swhid)
 
 
-@given(directory())
 def test_browse_swhid_special_characters_escaping(client, archive_data, directory):
     origin = "http://example.org/?project=abc;"
     archive_data.origin_add([Origin(url=origin)])
diff --git a/swh/web/tests/browse/views/test_origin.py b/swh/web/tests/browse/views/test_origin.py
--- a/swh/web/tests/browse/views/test_origin.py
+++ b/swh/web/tests/browse/views/test_origin.py
@@ -33,43 +33,35 @@
 )
 from swh.web.tests.data import get_content, random_sha1
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
-from swh.web.tests.strategies import (
-    new_origin,
-    new_snapshot,
-    origin,
-    origin_with_multiple_visits,
-    origin_with_pull_request_branches,
-    origin_with_releases,
-)
-from swh.web.tests.strategies import release as existing_release
-from swh.web.tests.strategies import revisions, unknown_revision, visit_dates
+from swh.web.tests.strategies import new_origin, new_snapshot, visit_dates
 from swh.web.tests.utils import check_html_get_response
 
 
-@given(origin_with_multiple_visits())
-def test_origin_visits_browse(client, archive_data, origin):
-    url = reverse("browse-origin-visits", query_params={"origin_url": origin["url"]})
+def test_origin_visits_browse(client, archive_data, origin_with_multiple_visits):
+    origin_url = origin_with_multiple_visits["url"]
+    url = reverse("browse-origin-visits", query_params={"origin_url": origin_url})
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/origin-visits.html"
     )
 
-    visits = archive_data.origin_visit_get(origin["url"])
+    visits = archive_data.origin_visit_get(origin_url)
 
     for v in visits:
         vdate = format_utc_iso_date(v["date"], "%Y-%m-%dT%H:%M:%SZ")
         browse_dir_url = reverse(
             "browse-origin-directory",
-            query_params={"origin_url": origin["url"], "timestamp": vdate},
+            query_params={"origin_url": origin_url, "timestamp": vdate},
         )
         assert_contains(resp, browse_dir_url)
 
-    _check_origin_link(resp, origin["url"])
+    _check_origin_link(resp, origin_url)
 
 
-@given(origin_with_multiple_visits())
-def test_origin_content_view(client, archive_data, swh_scheduler, origin):
-    origin_visits = archive_data.origin_visit_get(origin["url"])
+def test_origin_content_view(
+    client, archive_data, swh_scheduler, origin_with_multiple_visits
+):
+    origin_visits = archive_data.origin_visit_get(origin_with_multiple_visits["url"])
 
     def _get_archive_data(visit_idx):
         snapshot = archive_data.snapshot_get(origin_visits[visit_idx]["snapshot"])
@@ -93,7 +85,7 @@
     _origin_content_view_test_helper(
         client,
         archive_data,
-        origin,
+        origin_with_multiple_visits,
         origin_visits[-1],
         tdata["snapshot_sizes"],
         tdata["branches"],
@@ -105,7 +97,7 @@
     _origin_content_view_test_helper(
         client,
         archive_data,
-        origin,
+        origin_with_multiple_visits,
         origin_visits[-1],
         tdata["snapshot_sizes"],
         tdata["branches"],
@@ -118,7 +110,7 @@
     _origin_content_view_test_helper(
         client,
         archive_data,
-        origin,
+        origin_with_multiple_visits,
         origin_visits[-1],
         tdata["snapshot_sizes"],
         tdata["branches"],
@@ -133,7 +125,7 @@
     _origin_content_view_test_helper(
         client,
         archive_data,
-        origin,
+        origin_with_multiple_visits,
         origin_visits[0],
         tdata["snapshot_sizes"],
         tdata["branches"],
@@ -146,7 +138,7 @@
     _origin_content_view_test_helper(
         client,
         archive_data,
-        origin,
+        origin_with_multiple_visits,
         origin_visits[0],
         tdata["snapshot_sizes"],
         tdata["branches"],
@@ -157,7 +149,6 @@
     )
 
 
-@given(origin())
 def test_origin_root_directory_view(client, archive_data, swh_scheduler, origin):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
@@ -273,7 +264,6 @@
     )
 
 
-@given(origin())
 def test_origin_sub_directory_view(client, archive_data, swh_scheduler, origin):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
@@ -406,7 +396,6 @@
     )
 
 
-@given(origin())
 def test_origin_branches(client, archive_data, origin):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
@@ -422,7 +411,6 @@
     )
 
 
-@given(origin())
 def test_origin_releases(client, archive_data, origin):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
@@ -439,14 +427,12 @@
 
 
 @given(
-    new_origin(),
-    new_snapshot(min_size=4, max_size=4),
-    visit_dates(),
-    revisions(min_size=3, max_size=3),
+    new_origin(), new_snapshot(min_size=4, max_size=4), visit_dates(),
 )
 def test_origin_snapshot_null_branch(
-    client, archive_data, new_origin, new_snapshot, visit_dates, revisions
+    client, archive_data, revisions_list, new_origin, new_snapshot, visit_dates,
 ):
+    revisions = revisions_list(size=4)
     snp_dict = new_snapshot.to_dict()
     archive_data.origin_add([new_origin])
     for i, branch in enumerate(snp_dict["branches"].keys()):
@@ -481,14 +467,12 @@
 
 
 @given(
-    new_origin(),
-    new_snapshot(min_size=4, max_size=4),
-    visit_dates(),
-    revisions(min_size=4, max_size=4),
+    new_origin(), new_snapshot(min_size=4, max_size=4), visit_dates(),
 )
 def test_origin_snapshot_invalid_branch(
-    client, archive_data, new_origin, new_snapshot, visit_dates, revisions
+    client, archive_data, revisions_list, new_origin, new_snapshot, visit_dates,
 ):
+    revisions = revisions_list(size=4)
     snp_dict = new_snapshot.to_dict()
     archive_data.origin_add([new_origin])
     for i, branch in enumerate(snp_dict["branches"].keys()):
@@ -530,7 +514,6 @@
     )
 
 
-@given(origin())
 def test_browse_origin_directory_no_visit(client, mocker, origin):
     mock_get_origin_visits = mocker.patch(
         "swh.web.common.origin_visits.get_origin_visits"
@@ -547,7 +530,6 @@
     assert not mock_get_origin_visits.called
 
 
-@given(origin())
 def test_browse_origin_directory_unknown_visit(client, mocker, origin):
     mock_get_origin_visits = mocker.patch(
         "swh.web.common.origin_visits.get_origin_visits"
@@ -566,7 +548,6 @@
     assert mock_get_origin_visits.called
 
 
-@given(origin())
 def test_browse_origin_directory_not_found(client, origin):
     url = reverse(
         "browse-origin-directory",
@@ -579,7 +560,6 @@
     assert re.search("Directory.*not found", resp.content.decode("utf-8"))
 
 
-@given(origin())
 def test_browse_origin_content_no_visit(client, mocker, origin):
     mock_get_origin_visits = mocker.patch(
         "swh.web.common.origin_visits.get_origin_visits"
@@ -599,7 +579,6 @@
     assert not mock_get_origin_visits.called
 
 
-@given(origin())
 def test_browse_origin_content_unknown_visit(client, mocker, origin):
     mock_get_origin_visits = mocker.patch(
         "swh.web.common.origin_visits.get_origin_visits"
@@ -658,7 +637,6 @@
     assert re.search("snapshot.*is empty", resp.content.decode("utf-8"))
 
 
-@given(origin())
 def test_browse_origin_content_not_found(client, origin):
     url = reverse(
         "browse-origin-content",
@@ -671,7 +649,6 @@
     assert re.search("Directory entry.*not found", resp.content.decode("utf-8"))
 
 
-@given(origin())
 def test_browse_directory_snapshot_not_found(client, mocker, origin):
     mock_get_snapshot_context = mocker.patch(
         "swh.web.browse.snapshot_context.get_snapshot_context"
@@ -739,9 +716,9 @@
     assert not re.search("swh-tr-link", resp_content)
 
 
-@given(origin_with_releases())
-def test_origin_release_browse(client, archive_data, origin):
-    snapshot = archive_data.snapshot_get_latest(origin["url"])
+def test_origin_release_browse(client, archive_data, origin_with_releases):
+    origin_url = origin_with_releases["url"]
+    snapshot = archive_data.snapshot_get_latest(origin_url)
     release = [
         b for b in snapshot["branches"].values() if b["target_type"] == "release"
     ][-1]
@@ -749,7 +726,7 @@
     revision_data = archive_data.revision_get(release_data["target"])
     url = reverse(
         "browse-origin-directory",
-        query_params={"origin_url": origin["url"], "release": release_data["name"]},
+        query_params={"origin_url": origin_url, "release": release_data["name"]},
     )
 
     resp = check_html_get_response(
@@ -759,7 +736,7 @@
     assert_contains(resp, release["target"])
 
     swhid_context = {
-        "origin": origin["url"],
+        "origin": origin_url,
         "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         "anchor": gen_swhid(ObjectType.RELEASE, release_data["id"]),
     }
@@ -772,13 +749,15 @@
     assert_contains(resp, swh_dir_id_url)
 
 
-@given(origin_with_releases())
-def test_origin_release_browse_not_found(client, origin):
+def test_origin_release_browse_not_found(client, origin_with_releases):
 
     invalid_release_name = "swh-foo-bar"
     url = reverse(
         "browse-origin-directory",
-        query_params={"origin_url": origin["url"], "release": invalid_release_name},
+        query_params={
+            "origin_url": origin_with_releases["url"],
+            "release": invalid_release_name,
+        },
     )
 
     resp = check_html_get_response(
@@ -789,9 +768,9 @@
     )
 
 
-@given(new_origin(), unknown_revision())
+@given(new_origin())
 def test_origin_browse_directory_branch_with_non_resolvable_revision(
-    client, archive_data, new_origin, unknown_revision
+    client, archive_data, unknown_revision, new_origin,
 ):
     branch_name = "master"
     snapshot = Snapshot(
@@ -838,7 +817,6 @@
     assert_not_contains(resp, "swh:1:rev:")
 
 
-@given(origin())
 def test_origin_content_no_path(client, origin):
     url = reverse("browse-origin-content", query_params={"origin_url": origin["url"]})
 
@@ -1245,15 +1223,16 @@
 
 
 @given(
-    new_origin(), visit_dates(), revisions(min_size=10, max_size=10), existing_release()
+    new_origin(), visit_dates(),
 )
 def test_origin_branches_pagination_with_alias(
-    client, archive_data, mocker, new_origin, visit_dates, revisions, existing_release
+    client, archive_data, mocker, release, revisions_list, new_origin, visit_dates,
 ):
     """
     When a snapshot contains a branch or a release alias, pagination links
     in the branches / releases view should be displayed.
     """
+    revisions = revisions_list(size=10)
     mocker.patch("swh.web.browse.snapshot_context.PER_PAGE", len(revisions) / 2)
     snp_dict = {"branches": {}, "id": hash_to_bytes(random_sha1())}
     for i in range(len(revisions)):
@@ -1262,14 +1241,14 @@
             "target_type": "revision",
             "target": hash_to_bytes(revisions[i]),
         }
-    release = "".join(random.choices(string.ascii_lowercase, k=8))
+    release_name = "".join(random.choices(string.ascii_lowercase, k=8))
     snp_dict["branches"][b"RELEASE_ALIAS"] = {
         "target_type": "alias",
-        "target": release.encode(),
+        "target": release_name.encode(),
     }
-    snp_dict["branches"][release.encode()] = {
+    snp_dict["branches"][release_name.encode()] = {
         "target_type": "release",
-        "target": hash_to_bytes(existing_release),
+        "target": hash_to_bytes(release),
     }
     archive_data.origin_add([new_origin])
     archive_data.snapshot_add([Snapshot.from_dict(snp_dict)])
@@ -1300,26 +1279,28 @@
     assert_contains(resp, f'href="{browse_origin_url}"')
 
 
-@given(origin_with_pull_request_branches())
-def test_pull_request_branches_filtering(client, origin):
+def test_pull_request_branches_filtering(client, origin_with_pull_request_branches):
+    origin_url = origin_with_pull_request_branches.url
     # check no pull request branches are displayed in the Branches / Releases dropdown
-    url = reverse("browse-origin-directory", query_params={"origin_url": origin.url})
+    url = reverse("browse-origin-directory", query_params={"origin_url": origin_url})
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
     )
     assert_not_contains(resp, "refs/pull/")
 
     # check no pull request branches are displayed in the branches view
-    url = reverse("browse-origin-branches", query_params={"origin_url": origin.url})
+    url = reverse("browse-origin-branches", query_params={"origin_url": origin_url})
     resp = check_html_get_response(
         client, url, status_code=200, template_used="browse/branches.html"
     )
     assert_not_contains(resp, "refs/pull/")
 
 
-@given(origin_with_pull_request_branches())
-def test_browse_pull_request_branch(client, archive_data, origin):
-    snapshot = archive_data.snapshot_get_latest(origin.url)
+def test_browse_pull_request_branch(
+    client, archive_data, origin_with_pull_request_branches
+):
+    origin_url = origin_with_pull_request_branches.url
+    snapshot = archive_data.snapshot_get_latest(origin_url)
     pr_branch = random.choice(
         [
             branch
@@ -1329,7 +1310,7 @@
     )
     url = reverse(
         "browse-origin-directory",
-        query_params={"origin_url": origin.url, "branch": pr_branch},
+        query_params={"origin_url": origin_url, "branch": pr_branch},
     )
     check_html_get_response(
         client, url, status_code=200, template_used="browse/directory.html"
diff --git a/swh/web/tests/browse/views/test_release.py b/swh/web/tests/browse/views/test_release.py
--- a/swh/web/tests/browse/views/test_release.py
+++ b/swh/web/tests/browse/views/test_release.py
@@ -5,26 +5,24 @@
 
 import random
 
-from hypothesis import given
-
 from django.utils.html import escape
 
 from swh.model.swhids import ObjectType
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import format_utc_iso_date, reverse
 from swh.web.tests.django_asserts import assert_contains
-from swh.web.tests.strategies import origin_with_releases, release, unknown_release
 from swh.web.tests.utils import check_html_get_response
 
 
-@given(release())
 def test_release_browse(client, archive_data, release):
     _release_browse_checks(client, release, archive_data)
 
 
-@given(origin_with_releases())
-def test_release_browse_with_origin_snapshot(client, archive_data, origin):
-    snapshot = archive_data.snapshot_get_latest(origin["url"])
+def test_release_browse_with_origin_snapshot(
+    client, archive_data, origin_with_releases
+):
+    origin_url = origin_with_releases["url"]
+    snapshot = archive_data.snapshot_get_latest(origin_url)
     release = random.choice(
         [
             b["target"]
@@ -33,18 +31,17 @@
         ]
     )
 
-    _release_browse_checks(client, release, archive_data, origin_url=origin["url"])
+    _release_browse_checks(client, release, archive_data, origin_url=origin_url)
     _release_browse_checks(client, release, archive_data, snapshot_id=snapshot["id"])
     _release_browse_checks(
         client,
         release,
         archive_data,
-        origin_url=origin["url"],
+        origin_url=origin_url,
         snapshot_id=snapshot["id"],
     )
 
 
-@given(unknown_release())
 def test_release_browse_not_found(client, archive_data, unknown_release):
     url = reverse("browse-release", url_args={"sha1_git": unknown_release})
 
@@ -55,7 +52,6 @@
     assert_contains(resp, err_msg, status_code=404)
 
 
-@given(release())
 def test_release_uppercase(client, release):
     url = reverse(
         "browse-release-uppercase-checksum", url_args={"sha1_git": release.upper()}
diff --git a/swh/web/tests/browse/views/test_revision.py b/swh/web/tests/browse/views/test_revision.py
--- a/swh/web/tests/browse/views/test_revision.py
+++ b/swh/web/tests/browse/views/test_revision.py
@@ -16,24 +16,14 @@
 from swh.web.common.identifiers import gen_swhid
 from swh.web.common.utils import format_utc_iso_date, parse_iso8601_date_to_utc, reverse
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
-from swh.web.tests.strategies import (
-    directory,
-    new_origin,
-    new_person,
-    new_swh_date,
-    origin,
-    revision,
-    unknown_revision,
-)
+from swh.web.tests.strategies import new_origin, new_person, new_swh_date
 from swh.web.tests.utils import check_html_get_response
 
 
-@given(revision())
 def test_revision_browse(client, archive_data, revision):
     _revision_browse_checks(client, archive_data, revision)
 
 
-@given(origin())
 def test_revision_origin_snapshot_browse(client, archive_data, swh_scheduler, origin):
     snapshot = archive_data.snapshot_get_latest(origin["url"])
     revision = archive_data.snapshot_get_head(snapshot)
@@ -48,7 +38,6 @@
     _revision_browse_checks(client, archive_data, revision, origin_url=origin["url"])
 
 
-@given(revision())
 def test_revision_log_browse(client, archive_data, revision):
     per_page = 10
 
@@ -161,7 +150,7 @@
         )
 
 
-@given(revision(), unknown_revision(), new_origin())
+@given(new_origin())
 def test_revision_request_errors(client, revision, unknown_revision, new_origin):
     url = reverse("browse-revision", url_args={"sha1_git": unknown_revision})
 
@@ -186,7 +175,6 @@
     )
 
 
-@given(revision())
 def test_revision_uppercase(client, revision):
     url = reverse(
         "browse-revision-uppercase-checksum", url_args={"sha1_git": revision.upper()}
@@ -304,7 +292,6 @@
     assert_contains(resp, swh_dir_id_url)
 
 
-@given(revision())
 def test_revision_invalid_path(client, archive_data, revision):
     path = "foo/bar"
     url = reverse(
@@ -323,7 +310,7 @@
     assert_not_contains(resp, "swh-metadata-popover", status_code=404)
 
 
-@given(directory(), new_person(), new_swh_date())
+@given(new_person(), new_swh_date())
 def test_revision_metadata_display(archive_data, client, directory, person, date):
     metadata = {"foo": "bar"}
     revision = Revision(
diff --git a/swh/web/tests/common/test_archive.py b/swh/web/tests/common/test_archive.py
--- a/swh/web/tests/common/test_archive.py
+++ b/swh/web/tests/common/test_archive.py
@@ -29,37 +29,9 @@
 from swh.web.common.typing import OriginInfo, PagedResult
 from swh.web.tests.conftest import ctags_json_missing, fossology_missing
 from swh.web.tests.data import random_content, random_sha1
-from swh.web.tests.strategies import (
-    ancestor_revisions,
-    content,
-    contents,
-    contents_with_ctags,
-    directory,
-    empty_content,
-    empty_directory,
-    invalid_sha1,
-    new_origin,
-    new_revision,
-    non_ancestor_revisions,
-    origin,
-    release,
-    releases,
-    revision,
-    revision_with_submodules,
-    revisions,
-    sha256,
-    snapshot,
-    unknown_content,
-    unknown_contents,
-    unknown_directory,
-    unknown_release,
-    unknown_revision,
-    unknown_snapshot,
-    visit_dates,
-)
+from swh.web.tests.strategies import new_origin, new_revision, visit_dates
 
 
-@given(contents())
 def test_lookup_multiple_hashes_all_present(contents):
     input_data = []
     expected_output = []
@@ -70,7 +42,6 @@
     assert archive.lookup_multiple_hashes(input_data) == expected_output
 
 
-@given(contents(), unknown_contents())
 def test_lookup_multiple_hashes_some_missing(contents, unknown_contents):
     input_contents = list(itertools.chain(contents, unknown_contents))
     random.shuffle(input_contents)
@@ -92,7 +63,6 @@
     assert actual_lookup == {"found": None, "algo": "sha1_git"}
 
 
-@given(content())
 def test_lookup_hash_exist(archive_data, content):
     actual_lookup = archive.lookup_hash("sha1:%s" % content["sha1"])
 
@@ -109,7 +79,6 @@
     assert {"found": False} == actual_lookup
 
 
-@given(content())
 def test_search_hash_exist(content):
     actual_lookup = archive.search_hash("sha1:%s" % content["sha1"])
 
@@ -119,7 +88,6 @@
 @pytest.mark.skipif(
     ctags_json_missing, reason="requires ctags with json output support"
 )
-@given(contents_with_ctags())
 def test_lookup_content_ctags(indexer_data, contents_with_ctags):
     content_sha1 = random.choice(contents_with_ctags["sha1s"])
     indexer_data.content_add_ctags(content_sha1)
@@ -142,7 +110,6 @@
     assert actual_ctags == []
 
 
-@given(content())
 def test_lookup_content_filetype(indexer_data, content):
     indexer_data.content_add_mimetype(content["sha1"])
     actual_filetype = archive.lookup_content_filetype(content["sha1"])
@@ -151,7 +118,6 @@
     assert actual_filetype == expected_filetype
 
 
-@given(contents_with_ctags())
 def test_lookup_expression(indexer_data, contents_with_ctags):
     per_page = 10
     expected_ctags = []
@@ -187,7 +153,6 @@
 
 
 @pytest.mark.skipif(fossology_missing, reason="requires fossology-nomossa installed")
-@given(content())
 def test_lookup_content_license(indexer_data, content):
     indexer_data.content_add_license(content["sha1"])
     actual_license = archive.lookup_content_license(content["sha1"])
@@ -251,21 +216,18 @@
     assert actual_origin == expected_origin
 
 
-@given(invalid_sha1())
 def test_lookup_release_ko_id_checksum_not_a_sha1(invalid_sha1):
     with pytest.raises(BadInputExc) as e:
         archive.lookup_release(invalid_sha1)
     assert e.match("Invalid checksum")
 
 
-@given(sha256())
 def test_lookup_release_ko_id_checksum_too_long(sha256):
     with pytest.raises(BadInputExc) as e:
         archive.lookup_release(sha256)
     assert e.match("Only sha1_git is supported.")
 
 
-@given(releases())
 def test_lookup_release_multiple(archive_data, releases):
     actual_releases = list(archive.lookup_release_multiple(releases))
 
@@ -285,7 +247,6 @@
     assert actual_releases == [None] * len(unknown_releases_)
 
 
-@given(directory())
 def test_lookup_directory_with_path_not_found(directory):
     path = "some/invalid/path/here"
     with pytest.raises(NotFoundExc) as e:
@@ -295,7 +256,6 @@
     )
 
 
-@given(directory())
 def test_lookup_directory_with_path_found(archive_data, directory):
     directory_content = archive_data.directory_ls(directory)
     directory_entry = random.choice(directory_content)
@@ -304,14 +264,12 @@
     assert actual_result == directory_entry
 
 
-@given(release())
 def test_lookup_release(archive_data, release):
     actual_release = archive.lookup_release(release)
 
     assert actual_release == archive_data.release_get(release)
 
 
-@given(revision(), invalid_sha1(), sha256())
 def test_lookup_revision_with_context_ko_not_a_sha1(revision, invalid_sha1, sha256):
     sha1_git_root = revision
     sha1_git = invalid_sha1
@@ -327,7 +285,6 @@
     assert e.match("Only sha1_git is supported")
 
 
-@given(revision(), unknown_revision())
 def test_lookup_revision_with_context_ko_sha1_git_does_not_exist(
     revision, unknown_revision
 ):
@@ -339,7 +296,6 @@
     assert e.match("Revision %s not found" % sha1_git)
 
 
-@given(revision(), unknown_revision())
 def test_lookup_revision_with_context_ko_root_sha1_git_does_not_exist(
     revision, unknown_revision
 ):
@@ -350,7 +306,6 @@
     assert e.match("Revision root %s not found" % sha1_git_root)
 
 
-@given(ancestor_revisions())
 def test_lookup_revision_with_context(archive_data, ancestor_revisions):
     sha1_git = ancestor_revisions["sha1_git"]
     root_sha1_git = ancestor_revisions["sha1_git_root"]
@@ -369,7 +324,6 @@
         assert actual_revision == expected_revision
 
 
-@given(non_ancestor_revisions())
 def test_lookup_revision_with_context_ko(non_ancestor_revisions):
     sha1_git = non_ancestor_revisions["sha1_git"]
     root_sha1_git = non_ancestor_revisions["sha1_git_root"]
@@ -421,7 +375,6 @@
     assert e.match("Content not found for revision %s" % new_revision_id)
 
 
-@given(revision())
 def test_lookup_directory_with_revision_ko_path_to_nowhere(revision):
     invalid_path = "path/to/something/unknown"
     with pytest.raises(NotFoundExc) as e:
@@ -432,7 +385,6 @@
     assert e.match("not found")
 
 
-@given(revision_with_submodules())
 def test_lookup_directory_with_revision_submodules(
     archive_data, revision_with_submodules
 ):
@@ -455,7 +407,6 @@
     assert actual_data == expected_data
 
 
-@given(revision())
 def test_lookup_directory_with_revision_without_path(archive_data, revision):
     actual_directory_entries = archive.lookup_directory_with_revision(revision)
 
@@ -466,7 +417,6 @@
     assert actual_directory_entries["content"] == expected_directory_entries
 
 
-@given(revision())
 def test_lookup_directory_with_revision_with_path(archive_data, revision):
     rev_data = archive_data.revision_get(revision)
     dir_entries = [
@@ -492,7 +442,6 @@
         assert actual_dir_entry["content"] == sub_dir_entries
 
 
-@given(revision())
 def test_lookup_directory_with_revision_with_path_to_file_and_data(
     archive_data, revision
 ):
@@ -520,7 +469,6 @@
     assert actual_dir_entry["content"]["data"] == expected_data["data"]
 
 
-@given(revision())
 def test_lookup_revision(archive_data, revision):
     actual_revision = archive.lookup_revision(revision)
     assert actual_revision == archive_data.revision_get(revision)
@@ -534,7 +482,7 @@
 
     revision = archive.lookup_revision(hash_to_hex(new_revision["id"]))
     assert revision["message"] == "elegant fix for bug \\xff"
-    assert revision["decoding_failures"] == ["message"]
+    assert "message" in revision["decoding_failures"]
 
 
 @given(new_revision())
@@ -555,7 +503,6 @@
     assert e.match("Revision with sha1_git %s not found." % unknown_revision_)
 
 
-@given(revisions())
 def test_lookup_revision_multiple(archive_data, revisions):
     actual_revisions = list(archive.lookup_revision_multiple(revisions))
 
@@ -574,7 +521,6 @@
     assert actual_revisions == [None] * len(unknown_revisions_)
 
 
-@given(revision())
 def test_lookup_revision_log(archive_data, revision):
     actual_revision_log = list(archive.lookup_revision_log(revision, limit=25))
     expected_revision_log = archive_data.revision_log(revision, limit=25)
@@ -593,7 +539,6 @@
     return branches
 
 
-@given(origin())
 def test_lookup_revision_log_by(archive_data, origin):
     branches = _get_origin_branches(archive_data, origin)
     branch_name = random.choice(list(branches.keys()))
@@ -607,7 +552,6 @@
     assert actual_log == expected_log
 
 
-@given(origin())
 def test_lookup_revision_log_by_notfound(origin):
     with pytest.raises(NotFoundExc):
         archive.lookup_revision_log_by(
@@ -627,7 +571,6 @@
     )
 
 
-@given(content())
 def test_lookup_content_raw(archive_data, content):
     actual_content = archive.lookup_content_raw("sha256:%s" % content["sha256"])
 
@@ -636,8 +579,7 @@
     assert actual_content == expected_content
 
 
-@given(empty_content())
-def test_lookup_empty_content_raw(archive_data, empty_content):
+def test_lookup_empty_content_raw(empty_content):
     content_raw = archive.lookup_content_raw(f"sha1_git:{empty_content['sha1_git']}")
     assert content_raw["data"] == b""
 
@@ -654,7 +596,6 @@
     )
 
 
-@given(content())
 def test_lookup_content_with_sha1(archive_data, content):
     actual_content = archive.lookup_content(f"sha1:{content['sha1']}")
 
@@ -663,7 +604,6 @@
     assert actual_content == expected_content
 
 
-@given(content())
 def test_lookup_content_with_sha256(archive_data, content):
     actual_content = archive.lookup_content(f"sha256:{content['sha256']}")
 
@@ -686,7 +626,6 @@
     assert e.match("Directory with sha1_git %s not found" % unknown_directory_)
 
 
-@given(directory())
 def test_lookup_directory(archive_data, directory):
     actual_directory_ls = list(archive.lookup_directory(directory))
 
@@ -695,20 +634,17 @@
     assert actual_directory_ls == expected_directory_ls
 
 
-@given(empty_directory())
 def test_lookup_directory_empty(empty_directory):
     actual_directory_ls = list(archive.lookup_directory(empty_directory))
 
     assert actual_directory_ls == []
 
 
-@given(origin())
 def test_lookup_revision_by_nothing_found(origin):
     with pytest.raises(NotFoundExc):
         archive.lookup_revision_by(origin["url"], "invalid-branch-name")
 
 
-@given(origin())
 def test_lookup_revision_by(archive_data, origin):
     branches = _get_origin_branches(archive_data, origin)
     branch_name = random.choice(list(branches.keys()))
@@ -720,7 +656,6 @@
     assert actual_revision == expected_revision
 
 
-@given(origin(), revision())
 def test_lookup_revision_with_context_by_ko(origin, revision):
     with pytest.raises(NotFoundExc):
         archive.lookup_revision_with_context_by(
@@ -728,7 +663,6 @@
         )
 
 
-@given(origin())
 def test_lookup_revision_with_context_by(archive_data, origin):
     branches = _get_origin_branches(archive_data, origin)
     branch_name = random.choice(list(branches.keys()))
@@ -761,7 +695,6 @@
         archive.lookup_revision_through({"something-unknown": 10})
 
 
-@given(origin())
 def test_lookup_revision_through_with_context_by(archive_data, origin):
     branches = _get_origin_branches(archive_data, origin)
     branch_name = random.choice(list(branches.keys()))
@@ -780,7 +713,6 @@
     ) == archive.lookup_revision_with_context_by(origin["url"], branch_name, None, rev)
 
 
-@given(origin())
 def test_lookup_revision_through_with_revision_by(archive_data, origin):
     branches = _get_origin_branches(archive_data, origin)
     branch_name = random.choice(list(branches.keys()))
@@ -790,7 +722,6 @@
     ) == archive.lookup_revision_by(origin["url"], branch_name, None)
 
 
-@given(ancestor_revisions())
 def test_lookup_revision_through_with_context(ancestor_revisions):
     sha1_git = ancestor_revisions["sha1_git"]
     sha1_git_root = ancestor_revisions["sha1_git_root"]
@@ -800,14 +731,12 @@
     ) == archive.lookup_revision_with_context(sha1_git_root, sha1_git)
 
 
-@given(revision())
 def test_lookup_revision_through_with_revision(revision):
     assert archive.lookup_revision_through(
         {"sha1_git": revision}
     ) == archive.lookup_revision(revision)
 
 
-@given(revision())
 def test_lookup_directory_through_revision_ko_not_found(revision):
     with pytest.raises(NotFoundExc):
         archive.lookup_directory_through_revision(
@@ -815,7 +744,6 @@
         )
 
 
-@given(revision())
 def test_lookup_directory_through_revision_ok(archive_data, revision):
     rev_data = archive_data.revision_get(revision)
     dir_entries = [
@@ -830,7 +758,6 @@
     ) == (revision, archive.lookup_directory_with_revision(revision, dir_entry["name"]))
 
 
-@given(revision())
 def test_lookup_directory_through_revision_ok_with_data(archive_data, revision):
     rev_data = archive_data.revision_get(revision)
     dir_entries = [
@@ -850,7 +777,6 @@
     )
 
 
-@given(content(), directory(), release(), revision(), snapshot())
 def test_lookup_known_objects(
     archive_data, content, directory, release, revision, snapshot
 ):
@@ -870,13 +796,6 @@
     assert archive.lookup_object(ObjectType.SNAPSHOT, snapshot) == expected
 
 
-@given(
-    unknown_content(),
-    unknown_directory(),
-    unknown_release(),
-    unknown_revision(),
-    unknown_snapshot(),
-)
 def test_lookup_unknown_objects(
     unknown_content,
     unknown_directory,
@@ -905,7 +824,6 @@
     assert e.match(r"Snapshot.*not found")
 
 
-@given(invalid_sha1())
 def test_lookup_invalid_objects(invalid_sha1):
 
     with pytest.raises(BadInputExc) as e:
@@ -955,8 +873,7 @@
     }
 
 
-@given(content(), directory())
-def test_lookup_missing_hashes_some_present(archive_data, content, directory):
+def test_lookup_missing_hashes_some_present(content, directory):
     missing_rev = random_sha1()
     missing_rel = random_sha1()
     missing_snp = random_sha1()
@@ -974,7 +891,6 @@
     assert actual_result == {missing_rev, missing_rel, missing_snp}
 
 
-@given(origin())
 def test_lookup_origin_extra_trailing_slash(origin):
     origin_info = archive.lookup_origin({"url": f"{origin['url']}/"})
     assert origin_info["url"] == origin["url"]
@@ -995,7 +911,7 @@
     assert origin_info["url"] == origin_url
 
 
-@given(origin(), new_origin())
+@given(new_origin())
 def test_lookup_origins_get_by_sha1s(origin, unknown_origin):
     hasher = hashlib.sha1()
     hasher.update(origin["url"].encode("utf-8"))
@@ -1016,13 +932,11 @@
     assert origins == [origin_info, None]
 
 
-@given(origin())
 def test_search_origin(origin):
     results = archive.search_origin(url_pattern=origin["url"])[0]
     assert results == [{"url": origin["url"]}]
 
 
-@given(origin())
 def test_search_origin_use_ql(mocker, origin):
 
     ORIGIN = [{"url": origin["url"]}]
@@ -1042,7 +956,6 @@
     )
 
 
-@given(snapshot())
 def test_lookup_snapshot_sizes(archive_data, snapshot):
     branches = archive_data.snapshot_get(snapshot)["branches"]
 
@@ -1059,7 +972,6 @@
     assert archive.lookup_snapshot_sizes(snapshot) == expected_sizes
 
 
-@given(revision())
 def test_lookup_snapshot_sizes_with_filtering(archive_data, revision):
     rev_id = hash_to_bytes(revision)
     snapshot = Snapshot(
@@ -1090,7 +1002,6 @@
     )
 
 
-@given(snapshot())
 def test_lookup_snapshot_alias(snapshot):
     resolved_alias = archive.lookup_snapshot_alias(snapshot, "HEAD")
     assert resolved_alias is not None
@@ -1098,13 +1009,11 @@
     assert resolved_alias["target"] is not None
 
 
-@given(revision())
 def test_lookup_snapshot_missing(revision):
     with pytest.raises(NotFoundExc):
         archive.lookup_snapshot(revision)
 
 
-@given(revision())
 def test_lookup_snapshot_empty_branch_list(archive_data, revision):
     rev_id = hash_to_bytes(revision)
     snapshot = Snapshot(
@@ -1126,7 +1035,6 @@
     assert not branches
 
 
-@given(revision())
 def test_lookup_snapshot_branch_names_filtering(archive_data, revision):
     rev_id = hash_to_bytes(revision)
     snapshot = Snapshot(
@@ -1171,7 +1079,6 @@
                 assert not branch_name.startswith(exclude_prefix)
 
 
-@given(directory(), revision())
 def test_lookup_snapshot_branch_names_filtering_paginated(
     archive_data, directory, revision
 ):
diff --git a/swh/web/tests/common/test_identifiers.py b/swh/web/tests/common/test_identifiers.py
--- a/swh/web/tests/common/test_identifiers.py
+++ b/swh/web/tests/common/test_identifiers.py
@@ -6,7 +6,6 @@
 import random
 from urllib.parse import quote
 
-from hypothesis import given
 import pytest
 
 from swh.model.hashutil import hash_to_bytes
@@ -25,20 +24,8 @@
 from swh.web.common.typing import SWHObjectInfo
 from swh.web.common.utils import reverse
 from swh.web.tests.data import random_sha1
-from swh.web.tests.strategies import (
-    content,
-    directory,
-    directory_with_files,
-    directory_with_subdirs,
-    origin,
-    origin_with_multiple_visits,
-    release,
-    revision,
-    snapshot,
-)
 
 
-@given(content())
 def test_gen_swhid(content):
     swh_object_type = ObjectType.CONTENT
     sha1_git = content["sha1_git"]
@@ -74,7 +61,6 @@
     assert e.match("Invalid swh object type")
 
 
-@given(content(), directory(), release(), revision(), snapshot())
 def test_resolve_swhid_legacy(content, directory, release, revision, snapshot):
     for obj_type, obj_id in (
         (ObjectType.CONTENT, content["sha1_git"]),
@@ -111,7 +97,6 @@
         resolve_swhid(f"swh:1:ori:{random_sha1()}")
 
 
-@given(content(), directory(), release(), revision(), snapshot())
 def test_get_swhid(content, directory, release, revision, snapshot):
     for obj_type, obj_id in (
         (ObjectType.CONTENT, content["sha1_git"]),
@@ -130,7 +115,6 @@
         get_swhid("foo")
 
 
-@given(content(), directory(), release(), revision(), snapshot())
 def test_group_swhids(content, directory, release, revision, snapshot):
     swhids = []
     expected = {}
@@ -151,23 +135,30 @@
     assert swhid_groups == expected
 
 
-@given(directory_with_subdirs())
-def test_get_swhids_info_directory_context(archive_data, directory):
+def test_get_swhids_info_directory_context(archive_data, directory_with_subdirs):
     swhid = get_swhids_info(
-        [SWHObjectInfo(object_type=ObjectType.DIRECTORY, object_id=directory)],
+        [
+            SWHObjectInfo(
+                object_type=ObjectType.DIRECTORY, object_id=directory_with_subdirs
+            )
+        ],
         snapshot_context=None,
     )[0]
     assert swhid["swhid_with_context"] is None
 
     # path qualifier should be discarded for a root directory
     swhid = get_swhids_info(
-        [SWHObjectInfo(object_type=ObjectType.DIRECTORY, object_id=directory)],
+        [
+            SWHObjectInfo(
+                object_type=ObjectType.DIRECTORY, object_id=directory_with_subdirs
+            )
+        ],
         snapshot_context=None,
         extra_context={"path": "/"},
     )[0]
     assert swhid["swhid_with_context"] is None
 
-    dir_content = archive_data.directory_ls(directory)
+    dir_content = archive_data.directory_ls(directory_with_subdirs)
     dir_subdirs = [e for e in dir_content if e["type"] == "dir"]
     dir_subdir = random.choice(dir_subdirs)
     dir_subdir_path = f'/{dir_subdir["name"]}/'
@@ -180,7 +171,7 @@
     ]
 
     extra_context = {
-        "root_directory": directory,
+        "root_directory": directory_with_subdirs,
         "path": dir_subdir_path,
     }
 
@@ -204,7 +195,7 @@
     for swhid in (swhid_lower, swhid_upper):
         swhid_dir_parsed = get_swhid(swhid)
 
-        anchor = gen_swhid(ObjectType.DIRECTORY, directory)
+        anchor = gen_swhid(ObjectType.DIRECTORY, directory_with_subdirs)
 
         assert swhid_dir_parsed.qualifiers() == {
             "anchor": anchor,
@@ -220,7 +211,6 @@
         }
 
 
-@given(revision())
 def test_get_swhids_info_revision_context(archive_data, revision):
     revision_data = archive_data.revision_get(revision)
     directory = revision_data["directory"]
@@ -268,14 +258,15 @@
         }
 
 
-@given(origin_with_multiple_visits())
-def test_get_swhids_info_origin_snapshot_context(archive_data, origin):
+def test_get_swhids_info_origin_snapshot_context(
+    archive_data, origin_with_multiple_visits
+):
     """
     Test SWHIDs with contextual info computation under a variety of origin / snapshot
     browsing contexts.
     """
-
-    visits = archive_data.origin_visit_get(origin["url"])
+    origin_url = origin_with_multiple_visits["url"]
+    visits = archive_data.origin_visit_get(origin_url)
 
     for visit in visits:
         snapshot = archive_data.snapshot_get(visit["snapshot"])
@@ -325,12 +316,12 @@
                 {"anchor_type": ObjectType.REVISION, "anchor_id": revision_id},
             ),
             (
-                {"origin_url": origin["url"], "snapshot_id": snapshot_id},
+                {"origin_url": origin_url, "snapshot_id": snapshot_id},
                 {"anchor_type": ObjectType.REVISION, "anchor_id": head_rev_id},
             ),
             (
                 {
-                    "origin_url": origin["url"],
+                    "origin_url": origin_url,
                     "snapshot_id": snapshot_id,
                     "branch_name": branch_name,
                 },
@@ -341,7 +332,7 @@
             ),
             (
                 {
-                    "origin_url": origin["url"],
+                    "origin_url": origin_url,
                     "snapshot_id": snapshot_id,
                     "release_name": release_name,
                 },
@@ -349,7 +340,7 @@
             ),
             (
                 {
-                    "origin_url": origin["url"],
+                    "origin_url": origin_url,
                     "snapshot_id": snapshot_id,
                     "revision_id": revision_id,
                 },
@@ -427,10 +418,10 @@
             expected_snp_context = {}
 
             if "origin_url" in snp_ctx_params:
-                expected_cnt_context["origin"] = origin["url"]
-                expected_dir_context["origin"] = origin["url"]
-                expected_rev_context["origin"] = origin["url"]
-                expected_snp_context["origin"] = origin["url"]
+                expected_cnt_context["origin"] = origin_url
+                expected_dir_context["origin"] = origin_url
+                expected_rev_context["origin"] = origin_url
+                expected_snp_context["origin"] = origin_url
 
             assert swhid_cnt_parsed.qualifiers() == expected_cnt_context
             assert swhid_dir_parsed.qualifiers() == expected_dir_context
@@ -441,8 +432,7 @@
                 assert swhid_rel_parsed.qualifiers() == expected_rev_context
 
 
-@given(origin(), directory())
-def test_get_swhids_info_characters_and_url_escaping(archive_data, origin, directory):
+def test_get_swhids_info_characters_and_url_escaping(archive_data, directory, origin):
     snapshot_context = get_snapshot_context(origin_url=origin["url"])
     snapshot_context["origin_info"]["url"] = "http://example.org/?project=abc;def%"
     path = "/foo;/bar%"
@@ -470,9 +460,11 @@
     assert parsed_url_swhid.qualifiers()["path"] == "/foo%253B/bar%2525"
 
 
-@given(origin_with_multiple_visits())
-def test_resolve_swhids_snapshot_context(client, archive_data, origin):
-    visits = archive_data.origin_visit_get(origin["url"])
+def test_resolve_swhids_snapshot_context(
+    client, archive_data, origin_with_multiple_visits
+):
+    origin_url = origin_with_multiple_visits["url"]
+    visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     head_rev_id = archive_data.snapshot_get_head(snapshot)
@@ -510,7 +502,7 @@
         {"revision_id": random_rev_id},
     ):
         snapshot_context = get_snapshot_context(
-            snapshot["id"], origin["url"], **snp_ctx_params
+            snapshot["id"], origin_url, **snp_ctx_params
         )
 
         _check_resolved_swhid_browse_url(
@@ -634,7 +626,6 @@
         assert obj_swhid_resolved["browse_url"] == expected_url
 
 
-@given(directory())
 def test_resolve_swhid_with_escaped_chars(archive_data, directory):
     origin_url = "http://example.org/?project=abc;"
     archive_data.origin_add([Origin(url=origin_url)])
@@ -648,13 +639,14 @@
     assert origin_swhid_url_escaped in resolved_swhid["browse_url"]
 
 
-@given(directory_with_subdirs())
-def test_resolve_directory_swhid_path_without_trailing_slash(archive_data, directory):
-    dir_content = archive_data.directory_ls(directory)
+def test_resolve_directory_swhid_path_without_trailing_slash(
+    archive_data, directory_with_subdirs
+):
+    dir_content = archive_data.directory_ls(directory_with_subdirs)
     dir_subdirs = [e for e in dir_content if e["type"] == "dir"]
     dir_subdir = random.choice(dir_subdirs)
     dir_subdir_path = dir_subdir["name"]
-    anchor = gen_swhid(ObjectType.DIRECTORY, directory)
+    anchor = gen_swhid(ObjectType.DIRECTORY, directory_with_subdirs)
     swhid = gen_swhid(
         ObjectType.DIRECTORY,
         dir_subdir["target"],
@@ -663,13 +655,12 @@
     resolved_swhid = resolve_swhid(swhid)
     browse_url = reverse(
         "browse-directory",
-        url_args={"sha1_git": directory},
+        url_args={"sha1_git": directory_with_subdirs},
         query_params={"path": dir_subdir_path},
     )
     assert resolved_swhid["browse_url"] == browse_url
 
 
-@given(directory())
 def test_resolve_swhid_with_malformed_origin_url(archive_data, directory):
     origin_url = "http://example.org/project/abc"
     malformed_origin_url = "http:/example.org/project/abc"
@@ -681,7 +672,6 @@
     assert origin_url in resolved_swhid["browse_url"]
 
 
-@given(revision())
 def test_resolve_dir_entry_swhid_with_anchor_revision(archive_data, revision):
     revision_data = archive_data.revision_get(revision)
     directory = revision_data["directory"]
@@ -718,14 +708,15 @@
     assert resolved_swhid["browse_url"] == browse_url
 
 
-@given(directory_with_subdirs())
-def test_resolve_dir_entry_swhid_with_anchor_directory(archive_data, directory):
-    dir_content = archive_data.directory_ls(directory)
+def test_resolve_dir_entry_swhid_with_anchor_directory(
+    archive_data, directory_with_subdirs
+):
+    dir_content = archive_data.directory_ls(directory_with_subdirs)
     dir_entry = random.choice(
         [entry for entry in dir_content if entry["type"] == "dir"]
     )
 
-    dir_swhid = gen_swhid(ObjectType.DIRECTORY, directory)
+    dir_swhid = gen_swhid(ObjectType.DIRECTORY, directory_with_subdirs)
 
     swhid = gen_swhid(
         ObjectType.DIRECTORY,
@@ -734,7 +725,7 @@
     )
     browse_url = reverse(
         "browse-directory",
-        url_args={"sha1_git": directory},
+        url_args={"sha1_git": directory_with_subdirs},
         query_params={"path": f"{dir_entry['name']}"},
     )
 
@@ -743,14 +734,15 @@
     assert resolved_swhid["browse_url"] == browse_url
 
 
-@given(directory_with_files())
-def test_resolve_file_entry_swhid_with_anchor_directory(archive_data, directory):
-    dir_content = archive_data.directory_ls(directory)
+def test_resolve_file_entry_swhid_with_anchor_directory(
+    archive_data, directory_with_files
+):
+    dir_content = archive_data.directory_ls(directory_with_files)
     file_entry = random.choice(
         [entry for entry in dir_content if entry["type"] == "file"]
     )
 
-    dir_swhid = gen_swhid(ObjectType.DIRECTORY, directory)
+    dir_swhid = gen_swhid(ObjectType.DIRECTORY, directory_with_files)
 
     sha1_git = file_entry["checksums"]["sha1_git"]
     swhid = gen_swhid(
@@ -761,7 +753,7 @@
     browse_url = reverse(
         "browse-content",
         url_args={"query_string": f"sha1_git:{sha1_git}"},
-        query_params={"path": f"{directory}/{file_entry['name']}"},
+        query_params={"path": f"{directory_with_files}/{file_entry['name']}"},
     )
 
     resolved_swhid = resolve_swhid(swhid)
diff --git a/swh/web/tests/common/test_middlewares.py b/swh/web/tests/common/test_middlewares.py
--- a/swh/web/tests/common/test_middlewares.py
+++ b/swh/web/tests/common/test_middlewares.py
@@ -3,19 +3,16 @@
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from hypothesis import given
 import pytest
 
 from django.test import modify_settings
 
 from swh.web.common.utils import reverse
-from swh.web.tests.strategies import snapshot
 
 
 @modify_settings(
     MIDDLEWARE={"remove": ["swh.web.common.middlewares.ExceptionMiddleware"]}
 )
-@given(snapshot())
 def test_exception_middleware_disabled(client, mocker, snapshot):
     mock_browse_snapshot_directory = mocker.patch(
         "swh.web.browse.views.snapshot.browse_snapshot_directory"
@@ -28,7 +25,6 @@
         client.get(url)
 
 
-@given(snapshot())
 def test_exception_middleware_enabled(client, mocker, snapshot):
     mock_browse_snapshot_directory = mocker.patch(
         "swh.web.browse.views.snapshot.browse_snapshot_directory"
diff --git a/swh/web/tests/common/test_origin_visits.py b/swh/web/tests/common/test_origin_visits.py
--- a/swh/web/tests/common/test_origin_visits.py
+++ b/swh/web/tests/common/test_origin_visits.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019  The Software Heritage developers
+# Copyright (C) 2018-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
@@ -14,11 +14,7 @@
 from swh.web.common.exc import NotFoundExc
 from swh.web.common.origin_visits import get_origin_visit, get_origin_visits
 from swh.web.common.typing import OriginInfo
-from swh.web.tests.strategies import (
-    new_origin,
-    new_snapshots,
-    origin_with_multiple_visits,
-)
+from swh.web.tests.strategies import new_origin, new_snapshots
 
 
 @given(new_snapshots(3))
@@ -238,9 +234,8 @@
     assert get_origin_visit((OriginInfo(url=new_origin.url))) == expected_visit
 
 
-@given(origin_with_multiple_visits())
-def test_get_origin_visit_latest_snapshot(mocker, origin):
-    origin_visits = get_origin_visits(origin)
+def test_get_origin_visit_latest_snapshot(mocker, origin_with_multiple_visits):
+    origin_visits = get_origin_visits(origin_with_multiple_visits)
     first_visit = origin_visits[0]
     latest_visit = origin_visits[-1]
     mock_get_origin_visits = mocker.patch(
@@ -248,10 +243,14 @@
     )
     mock_get_origin_visits.return_value = origin_visits
 
-    visit = get_origin_visit(origin, snapshot_id=latest_visit["snapshot"])
+    visit = get_origin_visit(
+        origin_with_multiple_visits, snapshot_id=latest_visit["snapshot"]
+    )
     assert visit == latest_visit
     assert not mock_get_origin_visits.called
 
-    visit = get_origin_visit(origin, snapshot_id=first_visit["snapshot"])
+    visit = get_origin_visit(
+        origin_with_multiple_visits, snapshot_id=first_visit["snapshot"]
+    )
     assert visit == first_visit
     assert mock_get_origin_visits.called
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
@@ -3,9 +3,11 @@
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+from collections import defaultdict
 from datetime import timedelta
 import json
 import os
+import random
 import shutil
 from subprocess import PIPE, run
 import sys
@@ -20,16 +22,31 @@
 from django.test.utils import setup_databases  # type: ignore
 from rest_framework.test import APIClient, APIRequestFactory
 
-from swh.model.hashutil import ALGORITHMS, hash_to_bytes
+from swh.model.hashutil import (
+    ALGORITHMS,
+    DEFAULT_ALGORITHMS,
+    hash_to_bytes,
+    hash_to_hex,
+)
+from swh.model.model import Content, Directory
+from swh.model.swhids import ObjectType
 from swh.scheduler.tests.common import TASK_TYPES
 from swh.storage.algos.origin import origin_get_latest_visit_status
+from swh.storage.algos.revisions_walker import get_revisions_walker
 from swh.storage.algos.snapshot import snapshot_get_all_branches, snapshot_get_latest
 from swh.web.auth.utils import OIDC_SWH_WEB_CLIENT_ID
 from swh.web.common import converters
 from swh.web.common.origin_save import get_scheduler_load_task_types
 from swh.web.common.typing import OriginVisitInfo
+from swh.web.common.utils import browsers_supported_image_mimes
 from swh.web.config import get_config
-from swh.web.tests.data import get_tests_data, override_storages
+from swh.web.tests.data import (
+    get_tests_data,
+    override_storages,
+    random_content,
+    random_sha1,
+    random_sha256,
+)
 
 # Used to skip some tests
 ctags_json_missing = (
@@ -155,6 +172,560 @@
     return data
 
 
+@pytest.fixture(scope="function")
+def sha1():
+    """Fixture returning a valid hexadecimal sha1 value.
+    """
+    return random_sha1()
+
+
+@pytest.fixture(scope="function")
+def invalid_sha1():
+    """Fixture returning an invalid sha1 representation.
+    """
+    return hash_to_hex(bytes(random.randint(0, 255) for _ in range(50)))
+
+
+@pytest.fixture(scope="function")
+def sha256():
+    """Fixture returning a valid hexadecimal sha256 value.
+    """
+    return random_sha256()
+
+
+def _known_swh_objects(tests_data, object_type):
+    return tests_data[object_type]
+
+
+@pytest.fixture(scope="function")
+def content(tests_data):
+    """Fixture returning a random content ingested into the test archive.
+    """
+    return random.choice(_known_swh_objects(tests_data, "contents"))
+
+
+@pytest.fixture(scope="function")
+def contents(tests_data):
+    """Fixture returning random contents ingested into the test archive.
+    """
+    return random.choices(
+        _known_swh_objects(tests_data, "contents"), k=random.randint(2, 8)
+    )
+
+
+def _new_content(tests_data):
+    while True:
+        new_content = random_content()
+        sha1_bytes = hash_to_bytes(new_content["sha1"])
+        if tests_data["storage"].content_get_data(sha1_bytes) is None:
+            return new_content
+
+
+@pytest.fixture(scope="function")
+def unknown_content(tests_data):
+    """Fixture returning a random content not ingested into the test archive.
+    """
+    return _new_content(tests_data)
+
+
+@pytest.fixture(scope="function")
+def unknown_contents(tests_data):
+    """Fixture returning random contents not ingested into the test archive.
+    """
+    new_contents = []
+    new_content_ids = set()
+    nb_contents = random.randint(2, 8)
+    while len(new_contents) != nb_contents:
+        new_content = _new_content(tests_data)
+        if new_content["sha1"] not in new_content_ids:
+            new_contents.append(new_content)
+            new_content_ids.add(new_content["sha1"])
+    return list(new_contents)
+
+
+@pytest.fixture(scope="function")
+def empty_content():
+    """Fixture returning the empty content ingested into the test archive.
+    """
+    empty_content = Content.from_data(data=b"").to_dict()
+    for algo in DEFAULT_ALGORITHMS:
+        empty_content[algo] = hash_to_hex(empty_content[algo])
+    return empty_content
+
+
+@pytest.fixture(scope="function")
+def content_text(tests_data):
+    """
+    Fixture returning a random textual content ingested into the test archive.
+    """
+    return random.choice(
+        list(
+            filter(
+                lambda c: c["mimetype"].startswith("text/"),
+                _known_swh_objects(tests_data, "contents"),
+            )
+        )
+    )
+
+
+@pytest.fixture(scope="function")
+def content_text_non_utf8(tests_data):
+    """Fixture returning a random textual content not encoded to UTF-8 ingested
+    into the test archive.
+    """
+    return random.choice(
+        list(
+            filter(
+                lambda c: c["mimetype"].startswith("text/")
+                and c["encoding"] not in ("utf-8", "us-ascii"),
+                _known_swh_objects(tests_data, "contents"),
+            )
+        )
+    )
+
+
+@pytest.fixture(scope="function")
+def content_application_no_highlight(tests_data):
+    """Fixture returning a random textual content with mimetype
+    starting with application/ and no detected programming language to
+    highlight ingested into the test archive.
+    """
+    return random.choice(
+        list(
+            filter(
+                lambda c: c["mimetype"].startswith("application/")
+                and c["encoding"] != "binary"
+                and c["hljs_language"] == "nohighlight",
+                _known_swh_objects(tests_data, "contents"),
+            )
+        )
+    )
+
+
+@pytest.fixture(scope="function")
+def content_text_no_highlight(tests_data):
+    """Fixture returning a random textual content with no detected
+    programming language to highlight ingested into the test archive.
+    """
+    return random.choice(
+        list(
+            filter(
+                lambda c: c["mimetype"].startswith("text/")
+                and c["hljs_language"] == "nohighlight",
+                _known_swh_objects(tests_data, "contents"),
+            )
+        )
+    )
+
+
+@pytest.fixture(scope="function")
+def content_image_type(tests_data):
+    """Fixture returning a random image content ingested into the test archive.
+    """
+    return random.choice(
+        list(
+            filter(
+                lambda c: c["mimetype"] in browsers_supported_image_mimes,
+                _known_swh_objects(tests_data, "contents"),
+            )
+        )
+    )
+
+
+@pytest.fixture(scope="function")
+def content_unsupported_image_type_rendering(tests_data):
+    """Fixture returning a random image content ingested into the test archive that
+    can not be rendered by browsers.
+    """
+    return random.choice(
+        list(
+            filter(
+                lambda c: c["mimetype"].startswith("image/")
+                and c["mimetype"] not in browsers_supported_image_mimes,
+                _known_swh_objects(tests_data, "contents"),
+            )
+        )
+    )
+
+
+@pytest.fixture(scope="function")
+def content_utf8_detected_as_binary(tests_data):
+    """Fixture returning a random textual content detected as binary
+    by libmagic while they are valid UTF-8 encoded files.
+    """
+
+    def utf8_binary_detected(content):
+        if content["encoding"] != "binary":
+            return False
+        try:
+            content["raw_data"].decode("utf-8")
+        except Exception:
+            return False
+        else:
+            return True
+
+    return random.choice(
+        list(filter(utf8_binary_detected, _known_swh_objects(tests_data, "contents")))
+    )
+
+
+@pytest.fixture(scope="function")
+def contents_with_ctags():
+    """
+    Fixture returning contents ingested into the test archive.
+    Those contents are ctags compatible, that is running ctags on those lay results.
+    """
+    return {
+        "sha1s": [
+            "0ab37c02043ebff946c1937523f60aadd0844351",
+            "15554cf7608dde6bfefac7e3d525596343a85b6f",
+            "2ce837f1489bdfb8faf3ebcc7e72421b5bea83bd",
+            "30acd0b47fc25e159e27a980102ddb1c4bea0b95",
+            "4f81f05aaea3efb981f9d90144f746d6b682285b",
+            "5153aa4b6e4455a62525bc4de38ed0ff6e7dd682",
+            "59d08bafa6a749110dfb65ba43a61963d5a5bf9f",
+            "7568285b2d7f31ae483ae71617bd3db873deaa2c",
+            "7ed3ee8e94ac52ba983dd7690bdc9ab7618247b4",
+            "8ed7ef2e7ff9ed845e10259d08e4145f1b3b5b03",
+            "9b3557f1ab4111c8607a4f2ea3c1e53c6992916c",
+            "9c20da07ed14dc4fcd3ca2b055af99b2598d8bdd",
+            "c20ceebd6ec6f7a19b5c3aebc512a12fbdc9234b",
+            "e89e55a12def4cd54d5bff58378a3b5119878eb7",
+            "e8c0654fe2d75ecd7e0b01bee8a8fc60a130097e",
+            "eb6595e559a1d34a2b41e8d4835e0e4f98a5d2b5",
+        ],
+        "symbol_name": "ABS",
+    }
+
+
+@pytest.fixture(scope="function")
+def directory(tests_data):
+    """Fixture returning a random directory ingested into the test archive.
+    """
+    return random.choice(_known_swh_objects(tests_data, "directories"))
+
+
+def _directory_with_entry_type(tests_data, type_):
+    return random.choice(
+        list(
+            filter(
+                lambda d: any(
+                    [
+                        e["type"] == type_
+                        for e in list(
+                            tests_data["storage"].directory_ls(hash_to_bytes(d))
+                        )
+                    ]
+                ),
+                _known_swh_objects(tests_data, "directories"),
+            )
+        )
+    )
+
+
+@pytest.fixture(scope="function")
+def directory_with_subdirs(tests_data):
+    """Fixture returning a random directory containing sub directories ingested
+    into the test archive.
+    """
+    return _directory_with_entry_type(tests_data, "dir")
+
+
+@pytest.fixture(scope="function")
+def directory_with_files(tests_data):
+    """Fixture returning a random directory containing at least one regular file.
+    """
+    return _directory_with_entry_type(tests_data, "file")
+
+
+@pytest.fixture(scope="function")
+def unknown_directory(tests_data):
+    """Fixture returning a random directory not ingested into the test archive.
+    """
+    while True:
+        new_directory = random_sha1()
+        sha1_bytes = hash_to_bytes(new_directory)
+        if list(tests_data["storage"].directory_missing([sha1_bytes])):
+            return new_directory
+
+
+@pytest.fixture(scope="function")
+def empty_directory():
+    """Fixture returning the empty directory ingested into the test archive.
+    """
+    return Directory(entries=()).id.hex()
+
+
+@pytest.fixture(scope="function")
+def revision(tests_data):
+    """Fixturereturning a random revision ingested into the test archive.
+    """
+    return random.choice(_known_swh_objects(tests_data, "revisions"))
+
+
+@pytest.fixture(scope="function")
+def revisions(tests_data):
+    """Fixture returning random revisions ingested into the test archive.
+    """
+    return random.choices(
+        _known_swh_objects(tests_data, "revisions"), k=random.randint(2, 8),
+    )
+
+
+@pytest.fixture(scope="function")
+def revisions_list(tests_data):
+    """Fixture returning random revisions ingested into the test archive.
+    """
+
+    def gen_revisions_list(size):
+        return random.choices(_known_swh_objects(tests_data, "revisions"), k=size,)
+
+    return gen_revisions_list
+
+
+@pytest.fixture(scope="function")
+def unknown_revision(tests_data):
+    """Fixture returning a random revision not ingested into the test archive.
+    """
+    while True:
+        new_revision = random_sha1()
+        sha1_bytes = hash_to_bytes(new_revision)
+        if tests_data["storage"].revision_get([sha1_bytes])[0] is None:
+            return new_revision
+
+
+def _get_origin_dfs_revisions_walker(tests_data):
+    storage = tests_data["storage"]
+    origin = random.choice(tests_data["origins"][:-1])
+    snapshot = snapshot_get_latest(storage, origin["url"])
+    if snapshot.branches[b"HEAD"].target_type.value == "alias":
+        target = snapshot.branches[b"HEAD"].target
+        head = snapshot.branches[target].target
+    else:
+        head = snapshot.branches[b"HEAD"].target
+    return get_revisions_walker("dfs", storage, head)
+
+
+@pytest.fixture(scope="function")
+def ancestor_revisions(tests_data):
+    """Fixture returning a pair of revisions ingested into the test archive
+    with an ancestor relation.
+    """
+    # get a dfs revisions walker for one of the origins
+    # loaded into the test archive
+    revisions_walker = _get_origin_dfs_revisions_walker(tests_data)
+    master_revisions = []
+    children = defaultdict(list)
+    init_rev_found = False
+    # get revisions only authored in the master branch
+    for rev in revisions_walker:
+        for rev_p in rev["parents"]:
+            children[rev_p].append(rev["id"])
+        if not init_rev_found:
+            master_revisions.append(rev)
+        if not rev["parents"]:
+            init_rev_found = True
+
+    # head revision
+    root_rev = master_revisions[0]
+    # pick a random revision, different from head, only authored
+    # in the master branch
+    ancestor_rev_idx = random.choice(list(range(1, len(master_revisions) - 1)))
+    ancestor_rev = master_revisions[ancestor_rev_idx]
+    ancestor_child_revs = children[ancestor_rev["id"]]
+
+    return {
+        "sha1_git_root": hash_to_hex(root_rev["id"]),
+        "sha1_git": hash_to_hex(ancestor_rev["id"]),
+        "children": [hash_to_hex(r) for r in ancestor_child_revs],
+    }
+
+
+@pytest.fixture(scope="function")
+def non_ancestor_revisions(tests_data):
+    """Fixture returning a pair of revisions ingested into the test archive
+    with no ancestor relation.
+    """
+    # get a dfs revisions walker for one of the origins
+    # loaded into the test archive
+    revisions_walker = _get_origin_dfs_revisions_walker(tests_data)
+    merge_revs = []
+    children = defaultdict(list)
+    # get all merge revisions
+    for rev in revisions_walker:
+        if len(rev["parents"]) > 1:
+            merge_revs.append(rev)
+        for rev_p in rev["parents"]:
+            children[rev_p].append(rev["id"])
+    # find a merge revisions whose parents have a unique child revision
+    random.shuffle(merge_revs)
+    selected_revs = None
+    for merge_rev in merge_revs:
+        if all(len(children[rev_p]) == 1 for rev_p in merge_rev["parents"]):
+            selected_revs = merge_rev["parents"]
+
+    return {
+        "sha1_git_root": hash_to_hex(selected_revs[0]),
+        "sha1_git": hash_to_hex(selected_revs[1]),
+    }
+
+
+@pytest.fixture(scope="function")
+def revision_with_submodules():
+    """Fixture returning a revision that is known to
+    point to a directory with revision entries (aka git submodules)
+    """
+
+    return {
+        "rev_sha1_git": "ffcb69001f3f6745dfd5b48f72ab6addb560e234",
+        "rev_dir_sha1_git": "d92a21446387fa28410e5a74379c934298f39ae2",
+        "rev_dir_rev_path": "libtess2",
+    }
+
+
+@pytest.fixture(scope="function")
+def release(tests_data):
+    """Fixture returning a random release ingested into the test archive.
+    """
+    return random.choice(_known_swh_objects(tests_data, "releases"))
+
+
+@pytest.fixture(scope="function")
+def releases(tests_data):
+    """Fixture returning random releases ingested into the test archive.
+    """
+    return random.choices(
+        _known_swh_objects(tests_data, "releases"), k=random.randint(2, 8)
+    )
+
+
+@pytest.fixture(scope="function")
+def unknown_release(tests_data):
+    """Fixture returning a random release not ingested into the test archive.
+    """
+    while True:
+        new_release = random_sha1()
+        sha1_bytes = hash_to_bytes(new_release)
+        if tests_data["storage"].release_get([sha1_bytes])[0] is None:
+            return new_release
+
+
+@pytest.fixture(scope="function")
+def snapshot(tests_data):
+    """Fixture returning a random snapshot ingested into the test archive.
+    """
+    return random.choice(_known_swh_objects(tests_data, "snapshots"))
+
+
+@pytest.fixture(scope="function")
+def unknown_snapshot(tests_data):
+    """Fixture returning a random snapshot not ingested into the test archive.
+    """
+    while True:
+        new_snapshot = random_sha1()
+        sha1_bytes = hash_to_bytes(new_snapshot)
+        if tests_data["storage"].snapshot_get_branches(sha1_bytes) is None:
+            return new_snapshot
+
+
+@pytest.fixture(scope="function")
+def origin(tests_data):
+    """Fixture returning a random origin ingested into the test archive.
+    """
+    return random.choice(_known_swh_objects(tests_data, "origins"))
+
+
+@pytest.fixture(scope="function")
+def origin_with_multiple_visits(tests_data):
+    """Fixture returning a random origin with multiple visits ingested
+    into the test archive.
+    """
+    origins = []
+    storage = tests_data["storage"]
+    for origin in tests_data["origins"]:
+        visit_page = storage.origin_visit_get(origin["url"])
+        if len(visit_page.results) > 1:
+            origins.append(origin)
+    return random.choice(origins)
+
+
+@pytest.fixture(scope="function")
+def origin_with_releases(tests_data):
+    """Fixture returning a random origin with releases ingested into the test archive.
+    """
+    origins = []
+    for origin in tests_data["origins"]:
+        snapshot = snapshot_get_latest(tests_data["storage"], origin["url"])
+        if any([b.target_type.value == "release" for b in snapshot.branches.values()]):
+            origins.append(origin)
+    return random.choice(origins)
+
+
+@pytest.fixture(scope="function")
+def origin_with_pull_request_branches(tests_data):
+    """Fixture returning a random origin with pull request branches ingested
+    into the test archive.
+    """
+    origins = []
+    storage = tests_data["storage"]
+    for origin in storage.origin_list(limit=1000).results:
+        snapshot = snapshot_get_latest(storage, origin.url)
+        if any([b"refs/pull/" in b for b in snapshot.branches]):
+            origins.append(origin)
+    return random.choice(origins)
+
+
+def _object_type_swhid(tests_data, object_type):
+    return random.choice(
+        list(
+            filter(
+                lambda swhid: swhid.object_type == object_type,
+                _known_swh_objects(tests_data, "swhids"),
+            )
+        )
+    )
+
+
+@pytest.fixture(scope="function")
+def content_swhid(tests_data):
+    """Fixture returning a qualified SWHID for a random content object
+    ingested into the test archive.
+    """
+    return _object_type_swhid(tests_data, ObjectType.CONTENT)
+
+
+@pytest.fixture(scope="function")
+def directory_swhid(tests_data):
+    """Fixture returning a qualified SWHID for a random directory object
+    ingested into the test archive.
+    """
+    return _object_type_swhid(tests_data, ObjectType.DIRECTORY)
+
+
+@pytest.fixture(scope="function")
+def release_swhid(tests_data):
+    """Fixture returning a qualified SWHID for a random release object
+    ingested into the test archive.
+    """
+    return _object_type_swhid(tests_data, ObjectType.RELEASE)
+
+
+@pytest.fixture(scope="function")
+def revision_swhid(tests_data):
+    """Fixture returning a qualified SWHID for a random revision object
+    ingested into the test archive.
+    """
+    return _object_type_swhid(tests_data, ObjectType.REVISION)
+
+
+@pytest.fixture(scope="function")
+def snapshot_swhid(tests_data):
+    """Fixture returning a qualified SWHID for a snapshot object
+    ingested into the test archive.
+    """
+    return _object_type_swhid(tests_data, ObjectType.SNAPSHOT)
+
+
 # Fixture to manipulate data from a sample archive used in the tests
 @pytest.fixture(scope="function")
 def archive_data(tests_data):
diff --git a/swh/web/tests/misc/test_badges.py b/swh/web/tests/misc/test_badges.py
--- a/swh/web/tests/misc/test_badges.py
+++ b/swh/web/tests/misc/test_badges.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2020  The Software Heritage developers
+# Copyright (C) 2019-2021  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
@@ -13,72 +13,44 @@
 from swh.web.common.utils import reverse
 from swh.web.misc.badges import _badge_config, _get_logo_data
 from swh.web.tests.django_asserts import assert_contains
-from swh.web.tests.strategies import (
-    content,
-    directory,
-    invalid_sha1,
-    new_origin,
-    origin,
-    release,
-    revision,
-    snapshot,
-    unknown_content,
-    unknown_directory,
-    unknown_release,
-    unknown_revision,
-    unknown_snapshot,
-)
+from swh.web.tests.strategies import new_origin
 from swh.web.tests.utils import check_http_get_response
 
 
-@given(content())
 def test_content_badge(client, content):
     _test_badge_endpoints(client, "content", content["sha1_git"])
 
 
-@given(directory())
 def test_directory_badge(client, directory):
     _test_badge_endpoints(client, "directory", directory)
 
 
-@given(origin())
 def test_origin_badge(client, origin):
     _test_badge_endpoints(client, "origin", origin["url"])
 
 
-@given(release())
 def test_release_badge(client, release):
     _test_badge_endpoints(client, "release", release)
 
 
-@given(revision())
 def test_revision_badge(client, revision):
     _test_badge_endpoints(client, "revision", revision)
 
 
-@given(snapshot())
 def test_snapshot_badge(client, snapshot):
     _test_badge_endpoints(client, "snapshot", snapshot)
 
 
-@given(
-    unknown_content(),
-    unknown_directory(),
-    new_origin(),
-    unknown_release(),
-    unknown_revision(),
-    unknown_snapshot(),
-    invalid_sha1(),
-)
+@given(new_origin(),)
 def test_badge_errors(
     client,
     unknown_content,
     unknown_directory,
-    new_origin,
     unknown_release,
     unknown_revision,
     unknown_snapshot,
     invalid_sha1,
+    new_origin,
 ):
     for object_type, object_id in (
         ("content", unknown_content["sha1_git"]),
@@ -118,7 +90,6 @@
         _check_generated_badge(resp, "", "", error="invalid id")
 
 
-@given(origin(), release())
 def test_badge_endpoints_have_cors_header(client, origin, release):
     url = reverse(
         "swh-badge", url_args={"object_type": "origin", "object_id": origin["url"]}
diff --git a/swh/web/tests/misc/test_iframe.py b/swh/web/tests/misc/test_iframe.py
--- a/swh/web/tests/misc/test_iframe.py
+++ b/swh/web/tests/misc/test_iframe.py
@@ -3,21 +3,13 @@
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from hypothesis import given
 
 from swh.model.hashutil import hash_to_bytes
 from swh.model.swhids import CoreSWHID, ObjectType
 from swh.web.common.utils import reverse
-from swh.web.tests.strategies import (
-    content_swhid,
-    directory_swhid,
-    revision_swhid,
-    unknown_directory,
-)
 from swh.web.tests.utils import check_html_get_response
 
 
-@given(content_swhid())
 def test_content_swhid_iframe(client, content_swhid):
     url = reverse("swhid-iframe", url_args={"swhid": str(content_swhid)})
     check_html_get_response(
@@ -25,7 +17,6 @@
     )
 
 
-@given(content_swhid())
 def test_content_core_swhid_iframe(client, content_swhid):
     content_core_swhid = CoreSWHID(
         object_type=content_swhid.object_type, object_id=content_swhid.object_id
@@ -36,7 +27,6 @@
     )
 
 
-@given(directory_swhid())
 def test_directory_swhid_iframe(client, directory_swhid):
     url = reverse("swhid-iframe", url_args={"swhid": str(directory_swhid)})
     check_html_get_response(
@@ -44,7 +34,6 @@
     )
 
 
-@given(directory_swhid())
 def test_directory_core_swhid_iframe(client, directory_swhid):
     directory_core_swhid = CoreSWHID(
         object_type=directory_swhid.object_type, object_id=directory_swhid.object_id
@@ -55,7 +44,6 @@
     )
 
 
-@given(revision_swhid())
 def test_iframe_unsupported_object(client, revision_swhid):
     url = reverse("swhid-iframe", url_args={"swhid": str(revision_swhid)})
     check_html_get_response(
@@ -63,7 +51,6 @@
     )
 
 
-@given(unknown_directory())
 def test_iframe_object_not_found(client, unknown_directory):
     swhid = CoreSWHID(
         object_type=ObjectType.DIRECTORY, object_id=hash_to_bytes(unknown_directory)
@@ -74,7 +61,6 @@
     )
 
 
-@given(content_swhid())
 def test_swhid_iframe_unknown_error(client, mocker, content_swhid):
     mocker.patch("swh.web.misc.iframe.get_swhid").side_effect = Exception("Error")
     url = reverse("swhid-iframe", url_args={"swhid": str(content_swhid)})
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
@@ -3,369 +3,37 @@
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from collections import defaultdict
 from datetime import datetime
-import random
 
-from hypothesis import assume, settings
 from hypothesis.extra.dateutil import timezones
-from hypothesis.strategies import (
-    binary,
-    characters,
-    composite,
-    datetimes,
-    just,
-    lists,
-    sampled_from,
-    text,
-)
+from hypothesis.strategies import composite, datetimes, lists, text
 
-from swh.model.hashutil import DEFAULT_ALGORITHMS, hash_to_bytes, hash_to_hex
 from swh.model.hypothesis_strategies import origins as new_origin_strategy
+from swh.model.hypothesis_strategies import persons as new_person_strategy
+from swh.model.hypothesis_strategies import sha1_git
 from swh.model.hypothesis_strategies import snapshots as new_snapshot
-from swh.model.model import (
-    Content,
-    Directory,
-    Person,
-    Revision,
-    RevisionType,
-    TimestampWithTimezone,
-)
-from swh.model.swhids import ObjectType
-from swh.storage.algos.revisions_walker import get_revisions_walker
-from swh.storage.algos.snapshot import snapshot_get_latest
-from swh.web.common.utils import browsers_supported_image_mimes
-from swh.web.tests.data import get_tests_data
+from swh.model.model import Revision, RevisionType, TimestampWithTimezone
 
 # Module dedicated to the generation of input data for tests through
 # the use of hypothesis.
-# Some of these data are sampled from a test archive created and populated
-# in the swh.web.tests.data module.
-
-# Set the swh-web hypothesis profile if none has been explicitly set
-hypothesis_default_settings = settings.get_profile("default")
-if repr(settings()) == repr(hypothesis_default_settings):
-    settings.load_profile("swh-web")
-
-
-# The following strategies exploit the hypothesis capabilities
-
-
-def _known_swh_object(object_type):
-    return sampled_from(get_tests_data()[object_type])
-
-
-def sha1():
-    """
-    Hypothesis strategy returning a valid hexadecimal sha1 value.
-    """
-    return binary(min_size=20, max_size=20).map(hash_to_hex)
-
-
-def invalid_sha1():
-    """
-    Hypothesis strategy returning an invalid sha1 representation.
-    """
-    return binary(min_size=50, max_size=50).map(hash_to_hex)
-
-
-def sha256():
-    """
-    Hypothesis strategy returning a valid hexadecimal sha256 value.
-    """
-    return binary(min_size=32, max_size=32).map(hash_to_hex)
-
-
-def content():
-    """
-    Hypothesis strategy returning a random content ingested
-    into the test archive.
-    """
-    return _known_swh_object("contents")
-
-
-def contents():
-    """
-    Hypothesis strategy returning random contents ingested
-    into the test archive.
-    """
-    return lists(content(), min_size=2, max_size=8)
-
-
-def empty_content():
-    """
-    Hypothesis strategy returning the empty content ingested
-    into the test archive.
-    """
-    empty_content = Content.from_data(data=b"").to_dict()
-    for algo in DEFAULT_ALGORITHMS:
-        empty_content[algo] = hash_to_hex(empty_content[algo])
-    return just(empty_content)
-
-
-def content_text():
-    """
-    Hypothesis strategy returning random textual contents ingested
-    into the test archive.
-    """
-    return content().filter(lambda c: c["mimetype"].startswith("text/"))
-
-
-def content_text_non_utf8():
-    """
-    Hypothesis strategy returning random textual contents not encoded
-    to UTF-8 ingested into the test archive.
-    """
-    return content().filter(
-        lambda c: c["mimetype"].startswith("text/")
-        and c["encoding"] not in ("utf-8", "us-ascii")
-    )
-
-
-def content_application_no_highlight():
-    """
-    Hypothesis strategy returning random textual contents with mimetype
-    starting with application/ and no detected programming language to
-    highlight ingested into the test archive.
-    """
-    return content().filter(
-        lambda c: c["mimetype"].startswith("application/")
-        and c["encoding"] != "binary"
-        and c["hljs_language"] == "nohighlight"
-    )
-
-
-def content_text_no_highlight():
-    """
-    Hypothesis strategy returning random textual contents with no detected
-    programming language to highlight ingested into the test archive.
-    """
-    return content().filter(
-        lambda c: c["mimetype"].startswith("text/")
-        and c["hljs_language"] == "nohighlight"
-    )
-
-
-def content_image_type():
-    """
-    Hypothesis strategy returning random image contents ingested
-    into the test archive.
-    """
-    return content().filter(lambda c: c["mimetype"] in browsers_supported_image_mimes)
-
-
-def content_unsupported_image_type_rendering():
-    """
-    Hypothesis strategy returning random image contents ingested
-    into the test archive that can not be rendered by browsers.
-    """
-    return content().filter(
-        lambda c: c["mimetype"].startswith("image/")
-        and c["mimetype"] not in browsers_supported_image_mimes
-    )
-
-
-def content_utf8_detected_as_binary():
-    """
-    Hypothesis strategy returning random textual contents detected as binary
-    by libmagic while they are valid UTF-8 encoded files.
-    """
-
-    def utf8_binary_detected(content):
-        if content["encoding"] != "binary":
-            return False
-        try:
-            content["raw_data"].decode("utf-8")
-        except Exception:
-            return False
-        else:
-            return True
-
-    return content().filter(utf8_binary_detected)
-
-
-@composite
-def new_content(draw):
-    blake2s256_hex = draw(sha256())
-    sha1_hex = draw(sha1())
-    sha1_git_hex = draw(sha1())
-    sha256_hex = draw(sha256())
-
-    assume(sha1_hex != sha1_git_hex)
-    assume(blake2s256_hex != sha256_hex)
-
-    return {
-        "blake2S256": blake2s256_hex,
-        "sha1": sha1_hex,
-        "sha1_git": sha1_git_hex,
-        "sha256": sha256_hex,
-    }
-
-
-def unknown_content():
-    """
-    Hypothesis strategy returning a random content not ingested
-    into the test archive.
-    """
-    return new_content().filter(
-        lambda c: get_tests_data()["storage"].content_get_data(hash_to_bytes(c["sha1"]))
-        is None
-    )
-
-
-def unknown_contents():
-    """
-    Hypothesis strategy returning random contents not ingested
-    into the test archive.
-    """
-    return lists(unknown_content(), min_size=2, max_size=8)
-
-
-def directory():
-    """
-    Hypothesis strategy returning a random directory ingested
-    into the test archive.
-    """
-    return _known_swh_object("directories")
-
-
-def _directory_with_entry_type(type_):
-    return directory().filter(
-        lambda d: any(
-            [
-                e["type"] == type_
-                for e in list(
-                    get_tests_data()["storage"].directory_ls(hash_to_bytes(d))
-                )
-            ]
-        )
-    )
-
-
-def directory_with_subdirs():
-    """
-    Hypothesis strategy returning a random directory containing
-    sub directories ingested into the test archive.
-    """
-    return _directory_with_entry_type("dir")
-
-
-def directory_with_files():
-    """
-    Hypothesis strategy returning a random directory containing
-    at least one regular file
-    """
-    return _directory_with_entry_type("file")
-
-
-def empty_directory():
-    """
-    Hypothesis strategy returning the empty directory ingested
-    into the test archive.
-    """
-    return just(Directory(entries=()).id.hex())
-
-
-def unknown_directory():
-    """
-    Hypothesis strategy returning a random directory not ingested
-    into the test archive.
-    """
-    return sha1().filter(
-        lambda s: len(
-            list(get_tests_data()["storage"].directory_missing([hash_to_bytes(s)]))
-        )
-        > 0
-    )
-
-
-def origin():
-    """
-    Hypothesis strategy returning a random origin ingested
-    into the test archive.
-    """
-    return _known_swh_object("origins")
-
-
-def origin_with_multiple_visits():
-    """
-    Hypothesis strategy returning a random origin ingested
-    into the test archive.
-    """
-    ret = []
-    tests_data = get_tests_data()
-    storage = tests_data["storage"]
-    for origin in tests_data["origins"]:
-        visit_page = storage.origin_visit_get(origin["url"])
-        if len(visit_page.results) > 1:
-            ret.append(origin)
-    return sampled_from(ret)
-
-
-def origin_with_releases():
-    """
-    Hypothesis strategy returning a random origin ingested
-    into the test archive.
-    """
-    ret = []
-    tests_data = get_tests_data()
-    for origin in tests_data["origins"]:
-        snapshot = snapshot_get_latest(tests_data["storage"], origin["url"])
-        if any([b.target_type.value == "release" for b in snapshot.branches.values()]):
-            ret.append(origin)
-    return sampled_from(ret)
-
-
-def origin_with_pull_request_branches():
-    """
-    Hypothesis strategy returning a random origin with pull request branches
-    ingested into the test archive.
-    """
-    ret = []
-    tests_data = get_tests_data()
-    storage = tests_data["storage"]
-    origins = storage.origin_list(limit=1000)
-    for origin in origins.results:
-        snapshot = snapshot_get_latest(storage, origin.url)
-        if any([b"refs/pull/" in b for b in snapshot.branches]):
-            ret.append(origin)
-    return sampled_from(ret)
 
 
 def new_origin():
-    """
-    Hypothesis strategy returning a random origin not ingested
+    """Hypothesis strategy returning a random origin not ingested
     into the test archive.
     """
     return new_origin_strategy()
 
 
-def new_origins(nb_origins=None):
-    """
-    Hypothesis strategy returning random origins not ingested
-    into the test archive.
-    """
-    min_size = nb_origins if nb_origins is not None else 2
-    max_size = nb_origins if nb_origins is not None else 8
-    size = random.randint(min_size, max_size)
-    return lists(
-        new_origin(),
-        min_size=size,
-        max_size=size,
-        unique_by=lambda o: tuple(sorted(o.items())),
-    )
-
-
 def visit_dates(nb_dates=None):
-    """
-    Hypothesis strategy returning a list of visit dates.
+    """Hypothesis strategy returning a list of visit dates.
     """
     min_size = nb_dates if nb_dates else 2
     max_size = nb_dates if nb_dates else 8
     return lists(
         datetimes(
             min_value=datetime(2015, 1, 1, 0, 0),
-            max_value=datetime(2018, 12, 31, 0, 0),
+            max_value=datetime.now(),
             timezones=timezones(),
         ),
         min_size=min_size,
@@ -374,80 +42,20 @@
     ).map(sorted)
 
 
-def release():
-    """
-    Hypothesis strategy returning a random release ingested
-    into the test archive.
-    """
-    return _known_swh_object("releases")
-
-
-def releases(min_size=2, max_size=8):
-    """
-    Hypothesis strategy returning random releases ingested
-    into the test archive.
-    """
-    return lists(release(), min_size=min_size, max_size=max_size)
-
-
-def unknown_release():
-    """
-    Hypothesis strategy returning a random revision not ingested
-    into the test archive.
+def new_person():
+    """Hypothesis strategy returning random raw swh person data.
     """
-    return sha1().filter(
-        lambda s: get_tests_data()["storage"].release_get([s])[0] is None
-    )
-
-
-def revision():
-    """
-    Hypothesis strategy returning a random revision ingested
-    into the test archive.
-    """
-    return _known_swh_object("revisions")
-
-
-def unknown_revision():
-    """
-    Hypothesis strategy returning a random revision not ingested
-    into the test archive.
-    """
-    return sha1().filter(
-        lambda s: get_tests_data()["storage"].revision_get([hash_to_bytes(s)])[0]
-        is None
-    )
-
-
-@composite
-def new_person(draw):
-    """
-    Hypothesis strategy returning random raw swh person data.
-    """
-    name = draw(
-        text(
-            min_size=5,
-            max_size=30,
-            alphabet=characters(min_codepoint=0, max_codepoint=255),
-        )
-    )
-    email = "%s@company.org" % name
-    return Person(
-        name=name.encode(),
-        email=email.encode(),
-        fullname=("%s <%s>" % (name, email)).encode(),
-    )
+    return new_person_strategy()
 
 
 @composite
 def new_swh_date(draw):
-    """
-    Hypothesis strategy returning random raw swh date data.
+    """Hypothesis strategy returning random raw swh date data.
     """
     timestamp = draw(
-        datetimes(
-            min_value=datetime(2015, 1, 1, 0, 0), max_value=datetime(2018, 12, 31, 0, 0)
-        ).map(lambda d: int(d.timestamp()))
+        datetimes(min_value=datetime(2015, 1, 1, 0, 0), max_value=datetime.now()).map(
+            lambda d: int(d.timestamp())
+        )
     )
     return {
         "timestamp": timestamp,
@@ -458,12 +66,11 @@
 
 @composite
 def new_revision(draw):
-    """
-    Hypothesis strategy returning random raw swh revision data
+    """Hypothesis strategy returning random raw swh revision data
     not ingested into the test archive.
     """
     return Revision(
-        directory=draw(sha1().map(hash_to_bytes)),
+        directory=draw(sha1_git()),
         author=draw(new_person()),
         committer=draw(new_person()),
         message=draw(text(min_size=20, max_size=100).map(lambda t: t.encode())),
@@ -474,30 +81,6 @@
     )
 
 
-def revisions(min_size=2, max_size=8):
-    """
-    Hypothesis strategy returning random revisions ingested
-    into the test archive.
-    """
-    return lists(revision(), min_size=min_size, max_size=max_size)
-
-
-def unknown_revisions(min_size=2, max_size=8):
-    """
-    Hypothesis strategy returning random revisions not ingested
-    into the test archive.
-    """
-    return lists(unknown_revision(), min_size=min_size, max_size=max_size)
-
-
-def snapshot():
-    """
-    Hypothesis strategy returning a random snapshot ingested
-    into the test archive.
-    """
-    return _known_swh_object("snapshots")
-
-
 def new_snapshots(nb_snapshots=None):
     min_size = nb_snapshots if nb_snapshots else 2
     max_size = nb_snapshots if nb_snapshots else 8
@@ -506,192 +89,3 @@
         min_size=min_size,
         max_size=max_size,
     )
-
-
-def unknown_snapshot():
-    """
-    Hypothesis strategy returning a random revision not ingested
-    into the test archive.
-    """
-    return sha1().filter(
-        lambda s: get_tests_data()["storage"].snapshot_get_branches(hash_to_bytes(s))
-        is None
-    )
-
-
-def _get_origin_dfs_revisions_walker():
-    tests_data = get_tests_data()
-    storage = tests_data["storage"]
-    origin = random.choice(tests_data["origins"][:-1])
-    snapshot = snapshot_get_latest(storage, origin["url"])
-    if snapshot.branches[b"HEAD"].target_type.value == "alias":
-        target = snapshot.branches[b"HEAD"].target
-        head = snapshot.branches[target].target
-    else:
-        head = snapshot.branches[b"HEAD"].target
-    return get_revisions_walker("dfs", storage, head)
-
-
-def ancestor_revisions():
-    """
-    Hypothesis strategy returning a pair of revisions ingested into the
-    test archive with an ancestor relation.
-    """
-    # get a dfs revisions walker for one of the origins
-    # loaded into the test archive
-    revisions_walker = _get_origin_dfs_revisions_walker()
-    master_revisions = []
-    children = defaultdict(list)
-    init_rev_found = False
-    # get revisions only authored in the master branch
-    for rev in revisions_walker:
-        for rev_p in rev["parents"]:
-            children[rev_p].append(rev["id"])
-        if not init_rev_found:
-            master_revisions.append(rev)
-        if not rev["parents"]:
-            init_rev_found = True
-
-    # head revision
-    root_rev = master_revisions[0]
-    # pick a random revision, different from head, only authored
-    # in the master branch
-    ancestor_rev_idx = random.choice(list(range(1, len(master_revisions) - 1)))
-    ancestor_rev = master_revisions[ancestor_rev_idx]
-    ancestor_child_revs = children[ancestor_rev["id"]]
-
-    return just(
-        {
-            "sha1_git_root": hash_to_hex(root_rev["id"]),
-            "sha1_git": hash_to_hex(ancestor_rev["id"]),
-            "children": [hash_to_hex(r) for r in ancestor_child_revs],
-        }
-    )
-
-
-def non_ancestor_revisions():
-    """
-    Hypothesis strategy returning a pair of revisions ingested into the
-    test archive with no ancestor relation.
-    """
-    # get a dfs revisions walker for one of the origins
-    # loaded into the test archive
-    revisions_walker = _get_origin_dfs_revisions_walker()
-    merge_revs = []
-    children = defaultdict(list)
-    # get all merge revisions
-    for rev in revisions_walker:
-        if len(rev["parents"]) > 1:
-            merge_revs.append(rev)
-        for rev_p in rev["parents"]:
-            children[rev_p].append(rev["id"])
-    # find a merge revisions whose parents have a unique child revision
-    random.shuffle(merge_revs)
-    selected_revs = None
-    for merge_rev in merge_revs:
-        if all(len(children[rev_p]) == 1 for rev_p in merge_rev["parents"]):
-            selected_revs = merge_rev["parents"]
-
-    return just(
-        {
-            "sha1_git_root": hash_to_hex(selected_revs[0]),
-            "sha1_git": hash_to_hex(selected_revs[1]),
-        }
-    )
-
-
-# The following strategies returns data specific to some tests
-# that can not be generated and thus are hardcoded.
-
-
-def contents_with_ctags():
-    """
-    Hypothesis strategy returning contents ingested into the test
-    archive. Those contents are ctags compatible, that is running
-    ctags on those lay results.
-    """
-    return just(
-        {
-            "sha1s": [
-                "0ab37c02043ebff946c1937523f60aadd0844351",
-                "15554cf7608dde6bfefac7e3d525596343a85b6f",
-                "2ce837f1489bdfb8faf3ebcc7e72421b5bea83bd",
-                "30acd0b47fc25e159e27a980102ddb1c4bea0b95",
-                "4f81f05aaea3efb981f9d90144f746d6b682285b",
-                "5153aa4b6e4455a62525bc4de38ed0ff6e7dd682",
-                "59d08bafa6a749110dfb65ba43a61963d5a5bf9f",
-                "7568285b2d7f31ae483ae71617bd3db873deaa2c",
-                "7ed3ee8e94ac52ba983dd7690bdc9ab7618247b4",
-                "8ed7ef2e7ff9ed845e10259d08e4145f1b3b5b03",
-                "9b3557f1ab4111c8607a4f2ea3c1e53c6992916c",
-                "9c20da07ed14dc4fcd3ca2b055af99b2598d8bdd",
-                "c20ceebd6ec6f7a19b5c3aebc512a12fbdc9234b",
-                "e89e55a12def4cd54d5bff58378a3b5119878eb7",
-                "e8c0654fe2d75ecd7e0b01bee8a8fc60a130097e",
-                "eb6595e559a1d34a2b41e8d4835e0e4f98a5d2b5",
-            ],
-            "symbol_name": "ABS",
-        }
-    )
-
-
-def revision_with_submodules():
-    """
-    Hypothesis strategy returning a revision that is known to
-    point to a directory with revision entries (aka git submodule)
-    """
-    return just(
-        {
-            "rev_sha1_git": "ffcb69001f3f6745dfd5b48f72ab6addb560e234",
-            "rev_dir_sha1_git": "d92a21446387fa28410e5a74379c934298f39ae2",
-            "rev_dir_rev_path": "libtess2",
-        }
-    )
-
-
-def swhid():
-    """
-    Hypothesis strategy returning a qualified SWHID for any object
-    ingested into the test archive.
-    """
-    return _known_swh_object("swhids")
-
-
-def content_swhid():
-    """
-    Hypothesis strategy returning a qualified SWHID for a content object
-    ingested into the test archive.
-    """
-    return swhid().filter(lambda swhid: swhid.object_type == ObjectType.CONTENT)
-
-
-def directory_swhid():
-    """
-    Hypothesis strategy returning a qualified SWHID for a directory object
-    ingested into the test archive.
-    """
-    return swhid().filter(lambda swhid: swhid.object_type == ObjectType.DIRECTORY)
-
-
-def release_swhid():
-    """
-    Hypothesis strategy returning a qualified SWHID for a release object
-    ingested into the test archive.
-    """
-    return swhid().filter(lambda swhid: swhid.object_type == ObjectType.RELEASE)
-
-
-def revision_swhid():
-    """
-    Hypothesis strategy returning a qualified SWHID for a revision object
-    ingested into the test archive.
-    """
-    return swhid().filter(lambda swhid: swhid.object_type == ObjectType.REVISION)
-
-
-def snapshot_swhid():
-    """
-    Hypothesis strategy returning a qualified SWHID for a snapshot object
-    ingested into the test archive.
-    """
-    return swhid().filter(lambda swhid: swhid.object_type == ObjectType.SNAPSHOT)