diff --git a/swh/web/browse/views/origin.py b/swh/web/browse/views/origin.py
--- a/swh/web/browse/views/origin.py
+++ b/swh/web/browse/views/origin.py
@@ -8,7 +8,6 @@
 
 from swh.web.browse.browseurls import browse_route
 from swh.web.browse.snapshot_context import (
-    browse_snapshot_branches,
     browse_snapshot_content,
     browse_snapshot_directory,
     browse_snapshot_releases,
@@ -155,19 +154,16 @@
     r"origin/branches/", view_name="browse-origin-branches",
 )
 def origin_branches_browse(request):
-    """Django view that produces an HTML display of the list of branches
+    """
+    This route is deprecated; use http:get:`/browse/snapshot/branches` instead
+
+    Django view that produces an HTML display of the list of branches
     associated to an origin for a given visit.
 
     The URL that points to it is :http:get:`/browse/origin/branches/`
 
     """
-    return browse_snapshot_branches(
-        request,
-        origin_url=request.GET.get("origin_url"),
-        snapshot_id=request.GET.get("snapshot"),
-        timestamp=request.GET.get("timestamp"),
-        branch_name_include=request.GET.get("name_include"),
-    )
+    return redirect_to_new_route(request, "browse-snapshot-branches")
 
 
 @browse_route(
@@ -176,7 +172,10 @@
     view_name="browse-origin-branches-legacy",
 )
 def origin_branches_browse_legacy(request, origin_url, timestamp=None):
-    """Django view that produces an HTML display of the list of branches
+    """
+    This route is deprecated; use http:get:`/browse/snapshot/branches` instead
+
+    Django view that produces an HTML display of the list of branches
     associated to an origin for a given visit.
 
     The URLs that point to it are
@@ -184,12 +183,7 @@
     :http:get:`/browse/origin/(origin_url)/visit/(timestamp)/branches/`
 
     """
-    return browse_snapshot_branches(
-        request,
-        origin_url=origin_url,
-        snapshot_id=request.GET.get("snapshot"),
-        timestamp=timestamp,
-    )
+    return redirect_to_new_route(request, "browse-snapshot-branches")
 
 
 @browse_route(
diff --git a/swh/web/browse/views/snapshot.py b/swh/web/browse/views/snapshot.py
--- a/swh/web/browse/views/snapshot.py
+++ b/swh/web/browse/views/snapshot.py
@@ -161,17 +161,36 @@
 
 @browse_route(
     r"snapshot/(?P<snapshot_id>[0-9a-f]+)/branches/",
+    r"snapshot/branches/",
     view_name="browse-snapshot-branches",
     checksum_args=["snapshot_id"],
 )
-def snapshot_branches_browse(request, snapshot_id):
+def snapshot_branches_browse(request, snapshot_id=None):
     """Django view that produces an HTML display of the list of releases
     collected in a snapshot.
 
-    The url that points to it is
-    :http:get:`/browse/snapshot/(snapshot_id)/branches/`
+    The URLs that point to it are
+    :http:get:`/browse/snapshot/(snapshot_id)/branches/` and
+    :http:get:`/browse/snapshot/branches/`
     """
-    return browse_snapshot_branches(request, snapshot_id=snapshot_id)
+    if snapshot_id is None:
+        # This case happens when redirected from /origin/branches
+        snapshot_id = get_snapshot_from_request(request)
+        # Redirect to the same route with snapshot_id
+        return redirect(
+            reverse(
+                "browse-snapshot-branches",
+                url_args={"snapshot_id": snapshot_id},
+                query_params=request.GET,
+            ),
+        )
+    return browse_snapshot_branches(
+        request,
+        snapshot_id=snapshot_id,
+        origin_url=request.GET.get("origin_url"),
+        timestamp=request.GET.get("timestamp"),
+        branch_name_include=request.GET.get("name_include"),
+    )
 
 
 @browse_route(
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
@@ -5,7 +5,6 @@
 
 import random
 import re
-import string
 
 from hypothesis import given
 import pytest
@@ -31,11 +30,13 @@
     parse_iso8601_date_to_utc,
     reverse,
 )
-from swh.web.tests.data import get_content, random_sha1
+from swh.web.tests.data import get_content
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
 from swh.web.tests.strategies import new_origin, new_snapshot, visit_dates
 from swh.web.tests.utils import check_html_get_response
 
+# import string
+
 
 def test_origin_visits_browse(client, archive_data, origin_with_multiple_visits):
     origin_url = origin_with_multiple_visits["url"]
@@ -396,21 +397,6 @@
     )
 
 
-def test_origin_branches(client, archive_data, origin):
-    origin_visits = archive_data.origin_visit_get(origin["url"])
-
-    visit = origin_visits[-1]
-    snapshot = archive_data.snapshot_get(visit["snapshot"])
-    snapshot_sizes = archive_data.snapshot_count_branches(snapshot["id"])
-    snapshot_content = process_snapshot_branches(snapshot)
-
-    _origin_branches_test_helper(client, origin, snapshot_content, snapshot_sizes)
-
-    _origin_branches_test_helper(
-        client, origin, snapshot_content, snapshot_sizes, snapshot_id=visit["snapshot"]
-    )
-
-
 def test_origin_releases(client, archive_data, origin):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
@@ -832,7 +818,6 @@
     for browse_context in (
         "content",
         "directory",
-        "branches",
         "releases",
         "visits",
     ):
@@ -846,7 +831,7 @@
 
 
 @given(new_origin())
-@pytest.mark.parametrize("browse_context", ["log"])
+@pytest.mark.parametrize("browse_context", ["log", "branches"])
 def test_origin_view_redirects(client, browse_context, new_origin):
     query_params = {"origin_url": new_origin.url}
     url = reverse(f"browse-origin-{browse_context}", query_params=query_params)
@@ -858,7 +843,7 @@
 
 
 @given(new_origin())
-@pytest.mark.parametrize("browse_context", ["log"])
+@pytest.mark.parametrize("browse_context", ["log", "branches"])
 def test_origin_view_legacy_redirects(client, browse_context, new_origin):
     params = {"origin_url": new_origin.url, "timestamp": "2021-01-23T22:24:10Z"}
     url = reverse(
@@ -1155,51 +1140,6 @@
     assert_not_contains(resp, "swh-metadata-popover")
 
 
-def _origin_branches_test_helper(
-    client, origin_info, origin_snapshot, snapshot_sizes, snapshot_id=None
-):
-    query_params = {"origin_url": origin_info["url"], "snapshot": snapshot_id}
-
-    url = reverse("browse-origin-branches", query_params=query_params)
-
-    resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/branches.html"
-    )
-
-    origin_branches = origin_snapshot[0]
-    origin_releases = origin_snapshot[1]
-
-    origin_branches_url = reverse("browse-origin-branches", query_params=query_params)
-
-    assert_contains(resp, f'href="{escape(origin_branches_url)}"')
-    assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
-
-    origin_releases_url = reverse("browse-origin-releases", query_params=query_params)
-
-    nb_releases = len(origin_releases)
-    if nb_releases > 0:
-        assert_contains(resp, f'href="{escape(origin_releases_url)}">')
-        assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
-
-    assert_contains(resp, '<tr class="swh-branch-entry', count=len(origin_branches))
-
-    for branch in origin_branches:
-        browse_branch_url = reverse(
-            "browse-origin-directory",
-            query_params={"branch": branch["name"], **query_params},
-        )
-        assert_contains(resp, '<a href="%s">' % escape(browse_branch_url))
-
-        browse_revision_url = reverse(
-            "browse-revision",
-            url_args={"sha1_git": branch["revision"]},
-            query_params=query_params,
-        )
-        assert_contains(resp, '<a href="%s">' % escape(browse_revision_url))
-
-    _check_origin_link(resp, origin_info["url"])
-
-
 def _origin_releases_test_helper(
     client, origin_info, origin_snapshot, snapshot_sizes, snapshot_id=None
 ):
@@ -1246,54 +1186,55 @@
     _check_origin_link(resp, origin_info["url"])
 
 
-@given(
-    new_origin(), visit_dates(),
-)
-def test_origin_branches_pagination_with_alias(
-    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)):
-        branch = "".join(random.choices(string.ascii_lowercase, k=8))
-        snp_dict["branches"][branch.encode()] = {
-            "target_type": "revision",
-            "target": hash_to_bytes(revisions[i]),
-        }
-    release_name = "".join(random.choices(string.ascii_lowercase, k=8))
-    snp_dict["branches"][b"RELEASE_ALIAS"] = {
-        "target_type": "alias",
-        "target": release_name.encode(),
-    }
-    snp_dict["branches"][release_name.encode()] = {
-        "target_type": "release",
-        "target": hash_to_bytes(release),
-    }
-    archive_data.origin_add([new_origin])
-    archive_data.snapshot_add([Snapshot.from_dict(snp_dict)])
-    visit = archive_data.origin_visit_add(
-        [OriginVisit(origin=new_origin.url, date=visit_dates[0], type="git",)]
-    )[0]
-    visit_status = OriginVisitStatus(
-        origin=new_origin.url,
-        visit=visit.visit,
-        date=now(),
-        status="full",
-        snapshot=snp_dict["id"],
-    )
-    archive_data.origin_visit_status_add([visit_status])
-
-    url = reverse("browse-origin-branches", query_params={"origin_url": new_origin.url})
-
-    resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/branches.html"
-    )
-    assert_contains(resp, '<ul class="pagination')
+# @given(
+#     new_origin(), visit_dates(),
+# )
+# def test_origin_branches_pagination_with_alias(
+#     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)):
+#         branch = "".join(random.choices(string.ascii_lowercase, k=8))
+#         snp_dict["branches"][branch.encode()] = {
+#             "target_type": "revision",
+#             "target": hash_to_bytes(revisions[i]),
+#         }
+#     release_name = "".join(random.choices(string.ascii_lowercase, k=8))
+#     snp_dict["branches"][b"RELEASE_ALIAS"] = {
+#         "target_type": "alias",
+#         "target": release_name.encode(),
+#     }
+#     snp_dict["branches"][release_name.encode()] = {
+#         "target_type": "release",
+#         "target": hash_to_bytes(release),
+#     }
+#     archive_data.origin_add([new_origin])
+#     archive_data.snapshot_add([Snapshot.from_dict(snp_dict)])
+#     visit = archive_data.origin_visit_add(
+#         [OriginVisit(origin=new_origin.url, date=visit_dates[0], type="git",)]
+#     )[0]
+#     visit_status = OriginVisitStatus(
+#         origin=new_origin.url,
+#         visit=visit.visit,
+#         date=now(),
+#         status="full",
+#         snapshot=snp_dict["id"],
+#     )
+#     archive_data.origin_visit_status_add([visit_status])
+
+#     url = reverse("browse-origin-branches",
+#                   query_params={"origin_url": new_origin.url})
+
+#     resp = check_html_get_response(
+#         client, url, status_code=200, template_used="browse/branches.html"
+#     )
+#     assert_contains(resp, '<ul class="pagination')
 
 
 def _check_origin_link(resp, origin_url):
@@ -1303,21 +1244,21 @@
     assert_contains(resp, f'href="{browse_origin_url}"')
 
 
-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})
-    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})
-    resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/branches.html"
-    )
-    assert_not_contains(resp, "refs/pull/")
+# 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})
+#     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})
+#     resp = check_html_get_response(
+#         client, url, status_code=200, template_used="browse/branches.html"
+#     )
+#     assert_not_contains(resp, "refs/pull/")
 
 
 def test_browse_pull_request_branch(
diff --git a/swh/web/tests/browse/views/test_snapshot.py b/swh/web/tests/browse/views/test_snapshot.py
--- a/swh/web/tests/browse/views/test_snapshot.py
+++ b/swh/web/tests/browse/views/test_snapshot.py
@@ -3,24 +3,29 @@
 from dateutil import parser
 import pytest
 
+from django.utils.html import escape
+
+from swh.web.browse.snapshot_context import process_snapshot_branches
 from swh.web.common.utils import reverse
 from swh.web.tests.django_asserts import assert_contains
 from swh.web.tests.utils import check_html_get_response
 
 
-@pytest.mark.parametrize("browse_context", ["log"])
+@pytest.mark.parametrize(
+    "browse_context", [("log", "revision-log.html"), ("branches", "branches.html")]
+)
 def test_snapshot_browse_with_id(client, browse_context, snapshot):
     url = reverse(
-        f"browse-snapshot-{browse_context}", url_args={"snapshot_id": snapshot}
+        f"browse-snapshot-{browse_context[0]}", url_args={"snapshot_id": snapshot}
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="includes/snapshot-context.html"
+        client, url, status_code=200, template_used=f"browse/{browse_context[1]}"
     )
     assert_contains(resp, f"swh:1:snp:{snapshot}")
 
 
-@pytest.mark.parametrize("browse_context", ["log"])
+@pytest.mark.parametrize("browse_context", ["log", "branches"])
 def test_snapshot_browse_with_id_and_origin(
     client, browse_context, archive_data, origin
 ):
@@ -37,7 +42,7 @@
     assert_contains(resp, origin["url"])
 
 
-@pytest.mark.parametrize("browse_context", ["log"])
+@pytest.mark.parametrize("browse_context", ["log", "branches"])
 def test_snapshot_browse_with_id_origin_and_timestamp(
     client, browse_context, archive_data, origin_with_multiple_visits
 ):
@@ -55,7 +60,7 @@
     assert_contains(resp, visit["origin"])
 
 
-@pytest.mark.parametrize("browse_context", ["log"])
+@pytest.mark.parametrize("browse_context", ["log", "branches"])
 def test_snapshot_browse_without_id(client, browse_context, archive_data, origin):
     url = reverse(
         f"browse-snapshot-{browse_context}", query_params={"origin_url": origin["url"]}
@@ -71,7 +76,7 @@
     )
 
 
-@pytest.mark.parametrize("browse_context", ["log"])
+@pytest.mark.parametrize("browse_context", ["log", "branches"])
 def test_snapshot_browse_without_id_and_origin(client, browse_context):
     url = reverse(f"browse-snapshot-{browse_context}")
     resp = check_html_get_response(client, url, status_code=400,)
@@ -80,3 +85,70 @@
         "An origin URL must be provided as a query parameter",
         resp.content.decode("utf-8"),
     )
+
+
+def test_snapshot_browse_branches(client, archive_data, origin):
+    snapshot = archive_data.snapshot_get_latest(origin["url"])
+
+    snapshot_sizes = archive_data.snapshot_count_branches(snapshot["id"])
+    snapshot_content = process_snapshot_branches(snapshot)
+
+    _origin_branches_test_helper(
+        client, origin, snapshot_content, snapshot_sizes, snapshot_id=snapshot["id"]
+    )
+
+
+def _origin_branches_test_helper(
+    client, origin_info, origin_snapshot, snapshot_sizes, snapshot_id
+):
+    query_params = {"origin_url": origin_info["url"]}
+
+    url = reverse(
+        "browse-snapshot-branches",
+        url_args={"snapshot_id": snapshot_id},
+        query_params=query_params,
+    )
+
+    resp = check_html_get_response(
+        client, url, status_code=200, template_used="browse/branches.html"
+    )
+
+    origin_branches = origin_snapshot[0]
+    origin_releases = origin_snapshot[1]
+    # origin_branches_url = url
+
+    # assert_contains(resp, f'href="{escape(origin_branches_url)}"')
+    assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
+
+    origin_releases_url = reverse("browse-origin-releases", query_params=query_params)
+
+    nb_releases = len(origin_releases)
+    if nb_releases > 0:
+        assert_contains(resp, f'href="{escape(origin_releases_url)}">')
+        assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
+
+    # assert_contains(resp, '<tr class="swh-branch-entry', count=len(origin_branches))
+
+    for branch in origin_branches:
+        # browse_branch_url = reverse(
+        #     "browse-origin-directory",
+        #     query_params={"branch": branch["name"], **query_params},
+        # )
+        # # assert_contains(resp, '<a href="%s">' % escape(browse_branch_url))
+
+        # browse_revision_url = reverse(
+        #     "browse-revision",
+        #     url_args={"sha1_git": branch["revision"]},
+        #     query_params=query_params,
+        # )
+        # assert_contains(resp, '<a href="%s">' % escape(browse_revision_url))
+        pass
+
+    _check_origin_link(resp, origin_info["url"])
+
+
+def _check_origin_link(resp, origin_url):
+    browse_origin_url = reverse(
+        "browse-origin", query_params={"origin_url": origin_url}
+    )
+    assert_contains(resp, f'href="{browse_origin_url}"')