diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py
index c1ba415c4..1b0db751a 100644
--- a/tests/app/main/views/test_template_folders.py
+++ b/tests/app/main/views/test_template_folders.py
@@ -415,25 +415,20 @@ def test_can_create_email_template_with_parent_folder(
         data['parent_folder_id'])
 
 
-@pytest.mark.parametrize("folder_permissions, expected_len", [(['edit_folder_permissions'], 1), ([], 0)])
 def test_get_manage_folder_page(
     client_request,
     active_user_with_permissions,
     service_one,
     mock_get_template_folders,
-    mocker,
-    folder_permissions,
-    expected_len,
+    mocker
 ):
-    service_one["permissions"] += folder_permissions
     folder_id = str(uuid.uuid4())
     mock_get_template_folders.return_value = [
         {'id': folder_id, 'name': 'folder_two', 'parent_id': None, 'users_with_permission': [
             active_user_with_permissions.id
         ]},
     ]
-    mocker.patch('app.models.service.Service.get_team_member', return_value=active_user_with_permissions)
-
+    mocker.patch('app.models.service.Service.active_users', [active_user_with_permissions])
     page = client_request.get(
         'main.manage_template_folder',
         service_id=service_one['id'],
@@ -448,14 +443,46 @@ def test_get_manage_folder_page(
     expected_delete_url = "/services/{}/templates/folders/{}/delete".format(service_one['id'], folder_id)
     assert expected_delete_url in delete_link["href"]
 
+
+def test_get_manage_folder_viewing_permissions_for_users(
+    client_request,
+    active_user_with_permissions,
+    service_one,
+    mock_get_template_folders,
+    mocker
+):
+    folder_id = str(uuid.uuid4())
+    team_member = active_user_view_permissions(str(uuid.uuid4()))
+    team_member_2 = active_user_view_permissions(str(uuid.uuid4()))
+    service_one["permissions"] += ["edit_folder_permissions"]
+    mock_get_template_folders.return_value = [
+        {'id': folder_id, 'name': 'folder_two', 'parent_id': None, 'users_with_permission': [
+            active_user_with_permissions.id, team_member_2.id
+        ]},
+    ]
+    mocker.patch('app.models.service.Service.active_users', [active_user_with_permissions, team_member, team_member_2])
+
+    page = client_request.get(
+        'main.manage_template_folder',
+        service_id=service_one['id'],
+        template_folder_id=folder_id,
+        _test_page_title=False,
+    )
+    assert normalize_spaces(page.select_one('title').text) == (
+        'folder_two – Templates – service one – GOV.UK Notify'
+    )
     form_labels = page.select('legend[class=form-label]')
-    assert len(form_labels) == expected_len
-    if expected_len == 1:
-        assert "Users who can see this folder:" in form_labels[0].text
-        checkboxes = page.select('input[name=viewing_permissions]')
-        assert len(checkboxes) == 1
-        assert checkboxes[0]['value'] == active_user_with_permissions.id
-        assert "Test User" in page.findAll('label', {'for': 'viewing_permissions-0'})[0].text
+    assert "Users who can see this folder:" in form_labels[0].text
+    checkboxes = page.select('input[name=users_with_permission]')
+
+    assert len(checkboxes) == 2
+    assert checkboxes[0]['value'] == team_member.id
+    assert "checked" not in checkboxes[0].attrs
+
+    assert checkboxes[1]['value'] == team_member_2.id
+    assert "checked" in checkboxes[1].attrs
+
+    assert "Test User" in page.findAll('label', {'for': 'users_with_permission-0'})[0].text
 
 
 def test_manage_folder_page_404s(client_request, service_one, mock_get_template_folders):
@@ -488,13 +515,13 @@ def test_rename_folder(client_request, active_user_with_permissions, service_one
             active_user_with_permissions.id
         ]}
     ]
-    mocker.patch('app.models.service.Service.get_team_member', return_value=active_user_with_permissions)
+    mocker.patch('app.models.service.Service.active_users', [active_user_with_permissions])
 
     client_request.post(
         'main.manage_template_folder',
         service_id=service_one['id'],
         template_folder_id=folder_id,
-        _data={"name": "new beautiful name", "viewing_permissions": [active_user_with_permissions.id]},
+        _data={"name": "new beautiful name", "users_with_permission": []},
         _expected_redirect=url_for("main.choose_template",
                                    service_id=service_one['id'],
                                    template_folder_id=folder_id,
@@ -512,20 +539,21 @@ def test_rename_folder(client_request, active_user_with_permissions, service_one
 def test_manage_folder_users(
     client_request, active_user_with_permissions, service_one, mock_get_template_folders, mocker
 ):
+    team_member = active_user_view_permissions(str(uuid.uuid4()))
     mock_update = mocker.patch('app.template_folder_api_client.update_template_folder')
     folder_id = str(uuid.uuid4())
     mock_get_template_folders.return_value = [
         {'id': folder_id, 'name': 'folder_two', 'parent_id': None, 'users_with_permission': [
-            active_user_with_permissions.id
+            active_user_with_permissions.id, team_member.id
         ]}
     ]
-    mocker.patch('app.models.service.Service.get_team_member', return_value=active_user_with_permissions)
+    mocker.patch('app.models.service.Service.active_users', [active_user_with_permissions, team_member])
 
     client_request.post(
         'main.manage_template_folder',
         service_id=service_one['id'],
         template_folder_id=folder_id,
-        _data={"name": "new beautiful name", "viewing_permissions": []},
+        _data={"name": "new beautiful name", "users_with_permission": []},
         _expected_redirect=url_for("main.choose_template",
                                    service_id=service_one['id'],
                                    template_folder_id=folder_id,
@@ -536,7 +564,7 @@ def test_manage_folder_users(
         service_one['id'],
         folder_id,
         name="new beautiful name",
-        users_with_permission=[]
+        users_with_permission=[active_user_with_permissions.id]
     )