diff --git a/app/main/forms.py b/app/main/forms.py
index 3be4b71d4..399705c24 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -938,28 +938,6 @@ class DateFilterForm(StripWhitespaceForm):
     include_from_test_key = BooleanField("Include test keys", default="checked", false_values={"N"})
 
 
-class ChooseTemplateType(StripWhitespaceForm):
-
-    template_type = RadioField(
-        '',
-        validators=[
-            DataRequired()
-        ]
-    )
-
-    def __init__(self, include_letters=False, include_copy=False, include_folder=False, *args, **kwargs):
-
-        super().__init__(*args, **kwargs)
-
-        self.template_type.choices = filter(None, [
-            ('email', 'Email template'),
-            ('sms', 'Text message template'),
-            ('letter', 'Letter template') if include_letters else None,
-            ('copy-existing', 'Copy of an existing template') if include_copy else None,
-            ('folder', 'Folder') if include_folder else None,
-        ])
-
-
 class SearchByNameForm(StripWhitespaceForm):
 
     search = SearchField('Search by name')
diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index c277e2892..8019b7692 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -18,7 +18,6 @@ from app import (
 )
 from app.main import main
 from app.main.forms import (
-    ChooseTemplateType,
     EmailTemplateForm,
     LetterTemplateForm,
     LetterTemplatePostageForm,
@@ -126,7 +125,7 @@ def choose_template(service_id, template_type='all', template_folder_id=None):
     option_hints = {template_folder_id: 'current folder'}
 
     if request.method == 'POST' and templates_and_folders_form.validate_on_submit():
-        if not can_manage_folders():
+        if not current_user.has_permissions('manage_templates'):
             abort(403)
         try:
             return process_folder_management_form(templates_and_folders_form, template_folder_id)
@@ -139,7 +138,6 @@ def choose_template(service_id, template_type='all', template_folder_id=None):
     return render_template(
         'views/templates/choose.html',
         current_template_folder_id=template_folder_id,
-        can_manage_folders=can_manage_folders(),
         template_folder_path=current_service.get_template_folder_path(template_folder_id),
         template_list=template_list,
         show_search_box=current_service.count_of_templates_and_folders > 7,
@@ -208,13 +206,6 @@ def get_template_nav_items(template_folder_id):
     ]
 
 
-def can_manage_folders():
-    return (
-        current_service.has_permission('edit_folders') and
-        current_user.has_permissions('manage_templates')
-    )
-
-
 @main.route("/services/<service_id>/templates/<template_id>.<filetype>")
 @login_required
 @user_has_permissions()
@@ -260,26 +251,6 @@ def view_template_version_preview(service_id, template_id, version, filetype):
     return TemplatePreview.from_database_object(db_template, filetype)
 
 
-@main.route("/services/<service_id>/templates/add", methods=['GET', 'POST'])
-@main.route("/services/<service_id>/templates/folders/<template_folder_id>/add", methods=['GET', 'POST'])
-@login_required
-@user_has_permissions('manage_templates')
-def add_template_by_type(service_id, template_folder_id=None):
-
-    form = ChooseTemplateType(
-        include_letters=current_service.has_permission('letter'),
-        include_copy=(
-            current_service.all_templates or len(user_api_client.get_service_ids_for_user(current_user)) > 1
-        ),
-        include_folder=current_service.has_permission('edit_folders')
-    )
-
-    if form.validate_on_submit():
-        return _add_template_by_type(form.template_type.data, template_folder_id)
-
-    return render_template('views/templates/add.html', form=form)
-
-
 def _add_template_by_type(template_type, template_folder_id):
 
     if template_type == 'copy-existing':
@@ -422,36 +393,10 @@ def action_blocked(service_id, notification_type, return_to, template_id):
     )
 
 
-@main.route("/services/<service_id>/templates/add-folder", methods=['GET', 'POST'])
-@main.route("/services/<service_id>/templates/folders/<template_folder_id>/add-folder", methods=['GET', 'POST'])
-@login_required
-@user_has_permissions('manage_templates')
-def add_template_folder(service_id, template_folder_id=None):
-    if not current_service.has_permission('edit_folders'):
-        abort(403)
-
-    form = TemplateFolderForm()
-
-    if form.validate_on_submit():
-        template_folder_api_client.create_template_folder(
-            current_service.id, name=form.name.data, parent_id=template_folder_id
-        )
-        return redirect(
-            url_for('.choose_template', service_id=service_id, template_folder_id=template_folder_id)
-        )
-
-    return render_template(
-        'views/templates/add-template-folder.html',
-        form=form
-    )
-
-
 @main.route("/services/<service_id>/templates/folders/<template_folder_id>/manage", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_templates')
 def manage_template_folder(service_id, template_folder_id):
-    if not current_service.has_permission('edit_folders'):
-        abort(403)
 
     form = TemplateFolderForm(
         name=current_service.get_template_folder(template_folder_id)['name']
@@ -480,9 +425,6 @@ def manage_template_folder(service_id, template_folder_id):
 @user_has_permissions('manage_templates')
 def delete_template_folder(service_id, template_folder_id):
 
-    if not current_service.has_permission('edit_folders'):
-        abort(403)
-
     template_folder = current_service.get_template_folder(template_folder_id)
 
     form = TemplateFolderForm(name=template_folder['name'])
diff --git a/app/navigation.py b/app/navigation.py
index 7d00606ce..befb5e046 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -111,8 +111,6 @@ class HeaderNavigation(Navigation):
         'add_data_retention',
         'add_service',
         'add_service_template',
-        'add_template_by_type',
-        'add_template_folder',
         'agreement',
         'api_callbacks',
         'api_documentation',
@@ -300,8 +298,6 @@ class MainNavigation(Navigation):
         'templates': {
             'action_blocked',
             'add_service_template',
-            'add_template_by_type',
-            'add_template_folder',
             'check_messages',
             'check_notification',
             'choose_template',
@@ -555,8 +551,6 @@ class CaseworkNavigation(Navigation):
         'add_organisation',
         'add_service',
         'add_service_template',
-        'add_template_by_type',
-        'add_template_folder',
         'agreement',
         'api_callbacks',
         'api_documentation',
@@ -792,8 +786,6 @@ class OrgNavigation(Navigation):
         'add_organisation',
         'add_service',
         'add_service_template',
-        'add_template_by_type',
-        'add_template_folder',
         'agreement',
         'api_callbacks',
         'api_documentation',
diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index 42fe75105..3920edc5a 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -13,7 +13,7 @@
   <nav id=template-list>
     {% for item in template_list %}
       <div class="template-list-item {% if can_manage_folders %}template-list-item-with-checkbox{% endif %} {% if item.ancestors %}template-list-item-hidden-by-default{% endif %} {% if not item.ancestors %}template-list-item-without-ancestors{% endif %}">
-        {% if can_manage_folders %}
+        {% if current_user.has_permissions('manage_templates') %}
           {{ unlabelled_checkbox(
             id='templates-or-folder-{}'.format(item.id),
             name='templates_and_folders',
diff --git a/app/templates/views/templates/action_blocked.html b/app/templates/views/templates/action_blocked.html
index 91190bef6..a9b52d72d 100644
--- a/app/templates/views/templates/action_blocked.html
+++ b/app/templates/views/templates/action_blocked.html
@@ -15,14 +15,14 @@
         Sending {{ notification_type }} has been disabled for your service.
       </p>
       <p>
-        If you need to send {{ notification_type }} 
+        If you need to send {{ notification_type }}
         <a href="{{ url_for('.support') }}">get in touch with the GOV.UK Notify team</a>.
       </p>
 
       {% set
         back_link_dict = {
           'add_new_template': {
-            'url' : '.add_template_by_type', 'text': 'Back to add new template'
+            'url' : '.choose_template', 'text': 'Back to templates'
           },
           'templates': {
             'url' : '.choose_template', 'text' : 'Back to templates'
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index 1ef5c1c80..149a7fc3b 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -48,7 +48,7 @@
   {% else %}
 
     <div class="grid-row {% if current_service.all_template_folders %}bottom-gutter-1-2{% else %}bottom-gutter-2-3{% endif %}">
-      <div class="{% if can_manage_folders %} column-five-sixths {% else %} column-two-thirds {% endif %}">
+      <div class="{% if current_user.has_permissions('manage_templates') %} column-five-sixths {% else %} column-two-thirds {% endif %}">
         {{ folder_path(
           folders=template_folder_path,
           service_id=current_service.id,
@@ -58,12 +58,12 @@
         ) }}
       </div>
       {% if current_user.has_permissions('manage_templates') %}
-        {% if not can_manage_folders %}
+        {% if not current_user.has_permissions('manage_templates') %}
           <div class="column-one-third">
             <a href="{{ url_for('.add_template_by_type', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="button align-with-heading">Add new template</a>
           </div>
         {% endif %}
-        {% if can_manage_folders and current_template_folder_id %}
+        {% if current_user.has_permissions('manage_templates') and current_template_folder_id %}
           <div class="column-one-sixth">
             <a href="{{ url_for('.manage_template_folder', service_id=current_service.id, template_folder_id=current_template_folder_id) }}" class="folder-heading-manage-link">Manage</a>
           </div>
@@ -79,7 +79,7 @@
 
     {{ live_search(target_selector='#template-list .template-list-item', show=show_search_box, form=search_form) }}
 
-    {% if can_manage_folders %}
+    {% if current_user.has_permissions('manage_templates') %}
       {% call form_wrapper(
           module='template-folder-form',
           data_kwargs={'prev-state': templates_and_folders_form.op or None}
diff --git a/tests/app/main/views/test_letters.py b/tests/app/main/views/test_letters.py
index 8c861eea2..3711b9623 100644
--- a/tests/app/main/views/test_letters.py
+++ b/tests/app/main/views/test_letters.py
@@ -1,7 +1,6 @@
 from functools import partial
 
 import pytest
-from bs4 import BeautifulSoup
 from flask import url_for
 
 letters_urls = [
@@ -64,23 +63,21 @@ def test_letters_lets_in_without_permission(
     ),
 ])
 def test_given_option_to_add_letters_if_allowed(
-    logged_in_client,
+    client_request,
     service_one,
     mocker,
     mock_get_service_templates,
+    mock_get_template_folders,
     mock_get_organisations_and_services_for_user,
     permissions,
     choices,
 ):
     service_one['permissions'] = permissions
-    mocker.patch('app.service_api_client.get_service', return_value={"data": service_one})
 
-    response = logged_in_client.get(url_for('main.add_template_by_type', service_id=service_one['id']))
+    page = client_request.get('main.choose_template', service_id=service_one['id'])
 
-    assert response.status_code == 200
-    page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-    radios = page.select('input[type=radio]')
-    labels = page.select('label')
+    radios = page.select('#add_new_template_form input[type=radio]')
+    labels = page.select('#add_new_template_form label')
 
     assert len(radios) == len(choices)
     assert len(labels) == len(choices)
diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py
index 5fb8011b6..0cb5248e6 100644
--- a/tests/app/main/views/test_template_folders.py
+++ b/tests/app/main/views/test_template_folders.py
@@ -37,77 +37,6 @@ def _template(template_type, name, parent=None, template_id=None):
     }
 
 
-@pytest.mark.parametrize('parent_folder_id', [None, PARENT_FOLDER_ID])
-def test_add_page_shows_option_for_folder(
-    client_request,
-    service_one,
-    parent_folder_id,
-    mocker,
-    mock_get_service_templates,
-    mock_get_organisations_and_services_for_user,
-):
-    service_one['permissions'] += ['edit_folders']
-    mocker.patch('app.service_api_client.get_service', return_value={"data": service_one})
-
-    page = client_request.get(
-        'main.add_template_by_type',
-        service_id=service_one['id'],
-        template_folder_id=parent_folder_id,
-        _test_page_title=False
-    )
-
-    radios = page.select('input[type=radio]')
-    labels = page.select('label')
-
-    assert [x['value'] for x in radios] == ['email', 'sms', 'copy-existing', 'folder']
-    assert [x.text.strip() for x in labels] == [
-        'Email template',
-        'Text message template',
-        'Copy of an existing template',
-        'Folder'
-    ]
-
-
-@pytest.mark.parametrize('parent_folder_id', [None, PARENT_FOLDER_ID])
-def test_get_add_template_folder_page(client_request, service_one, parent_folder_id):
-    service_one['permissions'] += ['edit_folders']
-
-    page = client_request.get(
-        'main.add_template_folder',
-        service_id=service_one['id'],
-        template_folder_id=parent_folder_id
-    )
-
-    assert page.select_one('input[name=name]') is not None
-
-
-def test_add_template_folder_page_rejects_if_service_doesnt_have_permission(client_request, service_one):
-    client_request.get('main.add_template_folder', service_id=service_one['id'], _expected_status=403)
-    client_request.post('main.add_template_folder', service_id=service_one['id'], _expected_status=403)
-
-
-@pytest.mark.parametrize('parent_folder_id', [None, PARENT_FOLDER_ID])
-def test_post_add_template_folder_page(client_request, service_one, mocker, parent_folder_id):
-    mock_create = mocker.patch('app.template_folder_api_client.create_template_folder')
-
-    service_one['permissions'] += ['edit_folders']
-
-    client_request.post(
-        'main.add_template_folder',
-        service_id=service_one['id'],
-        template_folder_id=parent_folder_id,
-        _data={'name': 'foo'},
-        _expected_redirect=url_for(
-            'main.choose_template',
-            service_id=service_one['id'],
-            template_folder_id=parent_folder_id,
-            _external=True,
-        )
-    )
-
-    mock_create.assert_called_once_with(service_one['id'], name='foo', parent_id=parent_folder_id)
-
-
 @pytest.mark.parametrize(
     (
         'expected_title_tag,'
@@ -381,7 +310,7 @@ def test_should_show_templates_folder_page(
         ]}
     )
 
-    service_one['permissions'] += ['letter', 'edit_folders']
+    service_one['permissions'] += ['letter']
 
     page = client_request.get(
         'main.choose_template',
@@ -446,56 +375,6 @@ def test_should_show_templates_folder_page(
     mock_get_service_templates.assert_called_once_with(SERVICE_ONE_ID)
 
 
-@pytest.mark.parametrize("template_type", ["email", "sms"])
-def test_add_template_by_type_should_redirect_to_add_service_template(
-    client_request,
-    service_one,
-    template_type,
-    mock_get_service_templates,
-    mock_get_organisations_and_services_for_user,
-):
-    service_one['permissions'] += ['edit_folders']
-    client_request.post(
-        'main.add_template_by_type',
-        service_id=SERVICE_ONE_ID,
-        template_folder_id=PARENT_FOLDER_ID,
-        _data={'template_type': template_type},
-        _expected_redirect=url_for('main.add_service_template',
-                                   service_id=SERVICE_ONE_ID,
-                                   template_type=template_type,
-                                   template_folder_id=PARENT_FOLDER_ID,
-                                   _external=True),
-    )
-
-
-def test_add_template_by_type_should_redirect_to_view_template_for_letter(
-        client_request,
-        service_one,
-        mock_get_service_templates,
-        mock_get_organisations_and_services_for_user,
-        mock_create_service_template
-):
-    service_one['permissions'] += ['edit_folders']
-    service_one['permissions'] += ['letter']
-    client_request.post(
-        'main.add_template_by_type',
-        service_id=SERVICE_ONE_ID,
-        template_folder_id=PARENT_FOLDER_ID,
-        _data={'template_type': 'letter'},
-        _expected_redirect=url_for('main.view_template',
-                                   service_id=SERVICE_ONE_ID,
-                                   template_id='Untitled',
-                                   _external=True),
-    )
-    mock_create_service_template.assert_called_once_with('Untitled',
-                                                         'letter',
-                                                         'Body',
-                                                         SERVICE_ONE_ID,
-                                                         'Main heading',
-                                                         'normal',
-                                                         PARENT_FOLDER_ID)
-
-
 def test_can_create_email_template_with_parent_folder(
         client_request,
         mock_create_service_template
@@ -538,7 +417,6 @@ def test_get_manage_folder_page(
     mock_get_template_folders.return_value = [
         {'id': folder_id, 'name': 'folder_two', 'parent_id': None},
     ]
-    service_one['permissions'] += ['edit_folders']
 
     page = client_request.get(
         'main.manage_template_folder',
@@ -557,7 +435,6 @@ def test_get_manage_folder_page(
 
 
 def test_manage_folder_page_404s(client_request, service_one, mock_get_template_folders):
-    service_one['permissions'] += ['edit_folders']
     client_request.get(
         'main.manage_template_folder',
         service_id=service_one['id'],
@@ -566,13 +443,15 @@ def test_manage_folder_page_404s(client_request, service_one, mock_get_template_
     )
 
 
-def test_get_manage_folder_page_no_permissions(client_request, service_one, mock_get_template_folders):
-    folder_id = str(uuid.uuid4())
-
+def test_get_manage_folder_page_no_permissions(
+    client_request,
+    active_user_view_permissions,
+):
+    client_request.login(active_user_view_permissions)
     client_request.get(
         'main.manage_template_folder',
-        service_id=service_one['id'],
-        template_folder_id=folder_id,
+        service_id=SERVICE_ONE_ID,
+        template_folder_id=PARENT_FOLDER_ID,
         _expected_status=403
     )
 
@@ -583,7 +462,6 @@ def test_rename_folder(client_request, service_one, mock_get_template_folders, m
     mock_get_template_folders.return_value = [
         {'id': folder_id, 'name': 'folder_two', 'parent_id': None},
     ]
-    service_one['permissions'] += ['edit_folders']
 
     client_request.post(
         'main.manage_template_folder',
@@ -606,7 +484,6 @@ def test_rename_folder(client_request, service_one, mock_get_template_folders, m
 def test_delete_template_folder_should_request_confirmation(
     client_request, service_one, mock_get_template_folders, mocker
 ):
-    service_one['permissions'] += ['edit_folders']
     folder_id = str(uuid.uuid4())
     mock_get_template_folders.side_effect = [[
         {'id': folder_id, 'name': 'sacrifice', 'parent_id': None},
@@ -644,7 +521,6 @@ def test_delete_template_folder_should_request_confirmation(
 def test_delete_template_folder_should_detect_non_empty_folder_on_get(
     client_request, service_one, mock_get_template_folders, mocker
 ):
-    service_one['permissions'] += ['edit_folders']
     folder_id = str(uuid.uuid4())
     template_id = str(uuid.uuid4())
     mock_get_template_folders.side_effect = [
@@ -683,7 +559,6 @@ def test_delete_folder(client_request, service_one, mock_get_template_folders, m
         'app.models.service.Service.get_templates',
         return_value=[],
     )
-    service_one['permissions'] += ['edit_folders']
 
     client_request.post(
         'main.delete_template_folder',
@@ -713,15 +588,6 @@ def test_delete_folder(client_request, service_one, mock_get_template_folders, m
         marks=pytest.mark.xfail(raises=AssertionError)
     ),
 ])
-@pytest.mark.parametrize('extra_service_permissions', [
-    pytest.param(
-        ['edit_folders']
-    ),
-    pytest.param(
-        [],
-        marks=pytest.mark.xfail(raises=AssertionError)
-    ),
-])
 def test_should_show_checkboxes_for_selecting_templates(
     client_request,
     mocker,
@@ -731,9 +597,7 @@ def test_should_show_checkboxes_for_selecting_templates(
     mock_has_no_jobs,
     fake_uuid,
     user,
-    extra_service_permissions,
 ):
-    service_one['permissions'] += extra_service_permissions
     client_request.login(user(fake_uuid))
 
     page = client_request.get(
@@ -752,10 +616,13 @@ def test_should_show_checkboxes_for_selecting_templates(
         assert TEMPLATE_ONE_ID not in checkboxes[index]['id']
 
 
-@pytest.mark.parametrize('user,extra_service_permissions', [
-    (active_user_with_permissions, []),
-    (active_user_view_permissions, ['edit_folders']),
-    (active_caseworking_user, ['edit_folders']),
+@pytest.mark.parametrize('user', [
+    active_user_view_permissions,
+    active_caseworking_user,
+    pytest.param(
+        active_user_with_permissions,
+        marks=pytest.mark.xfail(raises=AssertionError),
+    ),
 ])
 def test_should_not_show_radios_and_buttons_for_move_destination_if_incorrect_permissions(
     client_request,
@@ -766,10 +633,7 @@ def test_should_not_show_radios_and_buttons_for_move_destination_if_incorrect_pe
     mock_has_no_jobs,
     fake_uuid,
     user,
-    extra_service_permissions,
 ):
-    service_one['permissions'] += extra_service_permissions
-
     client_request.login(user(fake_uuid))
 
     page = client_request.get(
@@ -795,8 +659,6 @@ def test_should_show_radios_and_buttons_for_move_destination_if_correct_permissi
     fake_uuid,
     active_user_with_permissions
 ):
-    service_one['permissions'] += ['edit_folders']
-
     client_request.login(active_user_with_permissions)
 
     FOLDER_TWO_ID = str(uuid.uuid4())
@@ -840,8 +702,6 @@ def test_move_to_shouldnt_select_a_folder_by_default(
     fake_uuid,
     active_user_with_permissions
 ):
-    service_one['permissions'] += ['edit_folders']
-
     client_request.login(active_user_with_permissions)
 
     FOLDER_TWO_ID = str(uuid.uuid4())
@@ -864,7 +724,6 @@ def test_should_be_able_to_move_to_existing_folder(
     mock_get_template_folders,
     mock_move_to_template_folder,
 ):
-    service_one['permissions'] += ['edit_folders']
     FOLDER_TWO_ID = str(uuid.uuid4())
     mock_get_template_folders.return_value = [
         {'id': PARENT_FOLDER_ID, 'name': 'folder_one', 'parent_id': None},
@@ -896,9 +755,9 @@ def test_should_be_able_to_move_to_existing_folder(
     )
 
 
-@pytest.mark.parametrize('user,extra_service_permissions', [
-    (active_user_view_permissions, ['edit_folders']),
-    (active_user_with_permissions, [])
+@pytest.mark.parametrize('user, expected_status, expected_called', [
+    (active_user_view_permissions, 403, False),
+    (active_user_with_permissions, 302, True),
 ])
 def test_should_not_be_able_to_move_to_existing_folder_if_dont_have_permission(
     client_request,
@@ -908,9 +767,9 @@ def test_should_not_be_able_to_move_to_existing_folder_if_dont_have_permission(
     mock_get_template_folders,
     mock_move_to_template_folder,
     user,
-    extra_service_permissions,
+    expected_status,
+    expected_called,
 ):
-    service_one['permissions'] += extra_service_permissions
     client_request.login(user(fake_uuid))
     FOLDER_TWO_ID = str(uuid.uuid4())
     mock_get_template_folders.return_value = [
@@ -928,9 +787,9 @@ def test_should_not_be_able_to_move_to_existing_folder_if_dont_have_permission(
                 TEMPLATE_ONE_ID,
             ],
         },
-        _expected_status=403
+        _expected_status=expected_status
     )
-    assert mock_move_to_template_folder.called is False
+    assert mock_move_to_template_folder.called is expected_called
 
 
 def test_move_folder_form_shows_current_folder_hint_when_in_a_folder(
@@ -939,7 +798,6 @@ def test_move_folder_form_shows_current_folder_hint_when_in_a_folder(
     mock_get_service_templates,
     mock_get_template_folders,
 ):
-    service_one['permissions'] += ['edit_folders']
     mock_get_template_folders.return_value = [
         {'id': PARENT_FOLDER_ID, 'name': 'parent_folder', 'parent_id': None},
         {'id': CHILD_FOLDER_ID, 'name': 'child_folder', 'parent_id': PARENT_FOLDER_ID},
@@ -967,7 +825,6 @@ def test_move_folder_form_does_not_show_current_folder_hint_at_the_top_level(
     mock_get_service_templates,
     mock_get_template_folders,
 ):
-    service_one['permissions'] += ['edit_folders']
     mock_get_template_folders.return_value = [
         {'id': PARENT_FOLDER_ID, 'name': 'parent_folder', 'parent_id': None},
         {'id': CHILD_FOLDER_ID, 'name': 'child_folder', 'parent_id': PARENT_FOLDER_ID},
@@ -996,7 +853,6 @@ def test_should_be_able_to_move_a_sub_item(
     mock_get_template_folders,
     mock_move_to_template_folder,
 ):
-    service_one['permissions'] += ['edit_folders']
     GRANDCHILD_FOLDER_ID = str(uuid.uuid4())
     mock_get_template_folders.return_value = [
         {'id': PARENT_FOLDER_ID, 'name': 'folder_one', 'parent_id': None},
@@ -1081,7 +937,7 @@ def test_no_action_if_user_fills_in_ambiguous_fields(
     mock_create_template_folder,
     data,
 ):
-    service_one['permissions'] += ['edit_folders', 'letter']
+    service_one['permissions'] += ['letter']
 
     mock_get_template_folders.return_value = [
         {'id': PARENT_FOLDER_ID, 'name': 'parent folder', 'parent_id': None},
@@ -1135,8 +991,6 @@ def test_new_folder_is_created_if_only_new_folder_is_filled_out(
         'operation': 'add-new-folder'
     }
 
-    service_one['permissions'] += ['edit_folders']
-
     client_request.post(
         'main.choose_template',
         service_id=SERVICE_ONE_ID,
@@ -1166,7 +1020,6 @@ def test_should_be_able_to_move_to_new_folder(
     mock_move_to_template_folder,
     mock_create_template_folder,
 ):
-    service_one['permissions'] += ['edit_folders']
     new_folder_id = mock_create_template_folder.return_value
     FOLDER_TWO_ID = str(uuid.uuid4())
     mock_get_template_folders.return_value = [
@@ -1211,8 +1064,6 @@ def test_radio_button_with_no_value_shows_custom_error_message(
     mock_move_to_template_folder,
     mock_create_template_folder,
 ):
-    service_one['permissions'] += ['edit_folders']
-
     page = client_request.post(
         'main.choose_template',
         service_id=SERVICE_ONE_ID,
@@ -1254,7 +1105,6 @@ def test_show_custom_error_message(
         data,
         error_msg,
 ):
-    service_one['permissions'] += ['edit_folders']
     mock_get_template_folders.return_value = [
         {'id': PARENT_FOLDER_ID, 'name': 'folder_one', 'parent_id': None},
         {'id': FOLDER_TWO_ID, 'name': 'folder_two', 'parent_id': None},
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py
index e967a1748..29fed97d5 100644
--- a/tests/app/main/views/test_templates.py
+++ b/tests/app/main/views/test_templates.py
@@ -60,11 +60,8 @@ def test_should_show_empty_page_when_no_templates(
     assert normalize_spaces(page.select_one('main p').text) == (
         'You need a template before you can send emails or text messages.'
     )
-    assert page.select_one('main a')['href'] == url_for(
-        'main.add_template_by_type',
-        service_id=service_one['id'],
-    )
-    assert len(page.select('main a')) == 1
+    assert page.select_one('#add_new_folder_form')
+    assert page.select_one('#add_new_template_form')
 
 
 def test_should_show_add_template_form_if_service_has_folder_permission(
@@ -74,9 +71,6 @@ def test_should_show_add_template_form_if_service_has_folder_permission(
     mock_get_service_templates_when_no_templates_exist,
     mock_get_template_folders,
 ):
-
-    service_one['permissions'] += ['edit_folders']
-
     page = client_request.get(
         'main.choose_template',
         service_id=service_one['id'],
@@ -276,7 +270,7 @@ def test_should_show_live_search_if_service_has_lots_of_folders(
 
 
 @pytest.mark.parametrize('extra_permissions, expected_values, expected_labels', (
-    pytest.param(['edit_folders'], [
+    pytest.param([], [
         'email',
         'sms',
         'copy-existing',
@@ -285,7 +279,7 @@ def test_should_show_live_search_if_service_has_lots_of_folders(
         'Text message template',
         'Copy of an existing template',
     ]),
-    pytest.param(['edit_folders', 'letter'], [
+    pytest.param(['letter'], [
         'email',
         'sms',
         'letter',
@@ -296,10 +290,6 @@ def test_should_show_live_search_if_service_has_lots_of_folders(
         'Letter template',
         'Copy of an existing template',
     ]),
-    pytest.param(
-        [], [], [],
-        marks=pytest.mark.xfail(raises=ElementNotFound)
-    ),
 ))
 def test_should_show_new_template_choices_if_service_has_folder_permission(
     client_request,
@@ -793,29 +783,20 @@ def test_dont_show_preview_letter_templates_for_bad_filetype(
     assert mock_get_service_template.called is False
 
 
-@pytest.mark.parametrize('endpoint, data', (
-    ('main.add_template_by_type', {
-        'template_type': 'copy-existing'
-    }),
-    ('main.choose_template', {
-        'operation': 'add-new-template',
-        'add_template_by_template_type': 'copy-existing'
-    }),
-))
 def test_choosing_to_copy_redirects(
     client_request,
     service_one,
     mock_get_service_templates,
     mock_get_template_folders,
     mock_get_organisations_and_services_for_user,
-    endpoint,
-    data,
 ):
-    service_one['permissions'] += ['edit_folders']
     client_request.post(
-        endpoint,
+        'main.choose_template',
         service_id=SERVICE_ONE_ID,
-        _data=data,
+        _data={
+            'operation': 'add-new-template',
+            'add_template_by_template_type': 'copy-existing'
+        },
         _expected_status=302,
         _expected_redirect=url_for(
             'main.choose_template_to_copy',
@@ -1209,20 +1190,6 @@ def test_cant_copy_template_from_non_member_service(
 
 
 @pytest.mark.parametrize('endpoint, data, expected_error', (
-    (
-        'main.add_template_by_type',
-        {
-            'template_type': 'email',
-        },
-        "Sending emails has been disabled for your service."
-    ),
-    (
-        'main.add_template_by_type',
-        {
-            'template_type': 'sms',
-        },
-        "Sending text messages has been disabled for your service."
-    ),
     (
         'main.choose_template',
         {
@@ -1250,7 +1217,7 @@ def test_should_not_allow_creation_of_template_through_form_without_correct_perm
     data,
     expected_error,
 ):
-    service_one['permissions'] = ['edit_folders']
+    service_one['permissions'] = []
     page = client_request.post(
         endpoint,
         service_id=SERVICE_ONE_ID,
@@ -1258,10 +1225,10 @@ def test_should_not_allow_creation_of_template_through_form_without_correct_perm
         _follow_redirects=True,
     )
     assert normalize_spaces(page.select('main p')[0].text) == expected_error
-    assert page.select(".page-footer-back-link")[0].text == "Back to add new template"
+    assert page.select(".page-footer-back-link")[0].text == "Back to templates"
     assert page.select(".page-footer-back-link")[0]['href'] == url_for(
-        '.add_template_by_type',
-        service_id=service_one['id'],
+        '.choose_template',
+        service_id=SERVICE_ONE_ID,
         template_id='0',
     )