diff --git a/app/assets/javascripts/modules/accessible-autocomplete.js b/app/assets/javascripts/modules/accessible-autocomplete.js
index f8a7edec8..3a2234ce1 100644
--- a/app/assets/javascripts/modules/accessible-autocomplete.js
+++ b/app/assets/javascripts/modules/accessible-autocomplete.js
@@ -3,7 +3,7 @@
 window.GOVUK = window.GOVUK || {}
 window.GOVUK.Modules = window.GOVUK.Modules || {}
 
-;(function (Modules) {
+; (function (Modules) {
   'use strict'
 
   function AccessibleAutocomplete ($module) {
@@ -23,17 +23,17 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}
     new window.accessibleAutocomplete.enhanceSelectElement(configOptions) // eslint-disable-line no-new, new-cap
 
     const autocompleteElement = selectElement.parentNode.querySelector('.autocomplete__input')
-    enableArrow(autocompleteElement)
-    enableAddButton()
+    enableArrow(this.$module, autocompleteElement)
+    enableAddButton(this.$module)
     resetSelectWhenDesynced(selectElement, autocompleteElement)
-    enableClearButton(selectElement, autocompleteElement)
+    enableClearButton(this.$module, selectElement, autocompleteElement)
   }
 
   Modules.AccessibleAutocomplete = AccessibleAutocomplete
 })(window.GOVUK.Modules)
 
-function enableArrow (autocompleteElement) {
-  const arrowElement = autocompleteElement.parentNode.querySelector('.autocomplete__dropdown-arrow-down')
+function enableArrow (module, autocompleteElement) {
+  const arrowElement = module.querySelector('.autocomplete__dropdown-arrow-down')
 
   arrowElement.addEventListener('click', function () {
     autocompleteElement.click()
@@ -41,10 +41,10 @@ function enableArrow (autocompleteElement) {
   })
 }
 
-function enableAddButton () {
-  const addButton = document.querySelector('.js-autocomplete__add-button')
-  const addAndFinishButton = document.querySelector('.js-autocomplete__add-and-finish-button')
-  const addMoreInput = document.querySelector('input[name="application[add_more]"]')
+function enableAddButton (module) {
+  const addButton = module.querySelector('.js-autocomplete__add-button')
+  const addAndFinishButton = module.querySelector('.js-autocomplete__add-and-finish-button')
+  const addMoreInput = module.querySelector('input[name="application[add_more]"]')
 
   if (addButton) {
     addAndFinishButton.type = 'button'
@@ -84,8 +84,8 @@ function resetSelectWhenDesynced (selectElement, autocompleteElement) {
   })
 }
 
-function enableClearButton (selectElement, autocompleteElement) {
-  const clearButton = document.querySelector('.js-autocomplete__clear-button')
+function enableClearButton (module, selectElement, autocompleteElement) {
+  const clearButton = module.querySelector('.js-autocomplete__clear-button')
 
   if (clearButton) {
     clearButton.addEventListener('click', function () {
diff --git a/app/views/shared/_add_permissions_with_autocomplete_form.html.erb b/app/views/shared/_add_permissions_with_autocomplete_form.html.erb
index 0a3d3bce4..84c718ef3 100644
--- a/app/views/shared/_add_permissions_with_autocomplete_form.html.erb
+++ b/app/views/shared/_add_permissions_with_autocomplete_form.html.erb
@@ -1,5 +1,5 @@
-<%= form_tag action, method: :patch do |f| %>
-  <div data-module="accessible-autocomplete">
+<div data-module="accessible-autocomplete">
+  <%= form_tag action, method: :patch do |f| %>
     <%= render "govuk_publishing_components/components/select", {
       id: "new_permission_id",
       heading_size: "m",
@@ -8,32 +8,33 @@
       name: "application[new_permission_id]",
       options: unassigned_permission_options.unshift({ text: '', value: nil })
     } %>
-  </div>
 
-  <% assigned_permissions.map(&:id).each do |id| %>
-    <%= hidden_field_tag "application[current_permission_ids][]", id %>
-  <% end %>
+    <div class="govuk-button-group">
+      <%= render "govuk_publishing_components/components/button", {
+          text: "Add",
+          aria_label: "Add permission",
+          classes: "js-autocomplete__add-button"
+      } %>
 
-  <%= hidden_field_tag "application[add_more]", "false" %>
+      <%= render "govuk_publishing_components/components/button", {
+          text: "Add and finish",
+          aria_label: "Add permission and finish",
+          classes: "js-autocomplete__add-and-finish-button"
+      } %>
 
-  <div class="govuk-button-group">
-    <%= render "govuk_publishing_components/components/button", {
-        text: "Add",
-        aria_label: "Add permission",
-        classes: "js-autocomplete__add-button"
-    } %>
+      <%= render "govuk_publishing_components/components/button", {
+          text: "Clear selection",
+          type: "button",
+          classes: "js-autocomplete__clear-button",
+          secondary_solid: true
+      } %>
+    </div>
 
-    <%= render "govuk_publishing_components/components/button", {
-        text: "Add and finish",
-        aria_label: "Add permission and finish",
-        classes: "js-autocomplete__add-and-finish-button"
-    } %>
 
-    <%= render "govuk_publishing_components/components/button", {
-        text: "Clear selection",
-        type: "button",
-        classes: "js-autocomplete__clear-button",
-        secondary_solid: true
-    } %>
-  </div>
-<% end %>
+    <% assigned_permissions.map(&:id).each do |id| %>
+      <%= hidden_field_tag "application[current_permission_ids][]", id %>
+    <% end %>
+
+    <%= hidden_field_tag "application[add_more]", "false" %>
+  <% end %>
+</div>
diff --git a/spec/javascripts/modules/accessible-autocomplete-dropdown-spec.js b/spec/javascripts/modules/accessible-autocomplete-dropdown-spec.js
deleted file mode 100644
index 18418f37c..000000000
--- a/spec/javascripts/modules/accessible-autocomplete-dropdown-spec.js
+++ /dev/null
@@ -1,46 +0,0 @@
-describe('GOVUK.Modules.AccessibleAutocomplete', function () {
-  let component, module
-
-  beforeEach(async function () {
-    component = document.createElement('div')
-    component.setAttribute('data-module', 'accessible-autocomplete')
-    component.innerHTML = `
-      <label class="govuk-label govuk-label--m" for="new_permission_id">Add a permission</label>
-      <div id="hint-1234" class="gem-c-hint govuk-hint">
-        Search for the permission you want to add.
-        <select name="application[new_permission_id]" id="new_permission_id" class="govuk-select" aria-describedby="hint-1234">
-          <option value=""></option>
-          <option value="1">permission-1</option>
-          <option value="2">permission-2</option>
-          <option value="3">permission-3</option>
-          <option value="4">permission-4</option>
-          <option value="5">permission-5</option>
-          <option value="6">permission-6</option>
-          <option value="7">permission-7</option>
-          <option value="8">permission-8</option>
-          <option value="9">permission-9</option>
-        </select>
-      </div>
-    `
-    module = new GOVUK.Modules.AccessibleAutocomplete(component)
-    module.init()
-  })
-
-  it('opens the menu when clicking the arrow', async function () {
-    const menuElement = component.querySelector('.autocomplete__menu')
-    const menuElementClassesBefore = Array.from(menuElement.classList)
-    expect(menuElementClassesBefore.includes('autocomplete__menu--visible')).toBe(false)
-    expect(menuElementClassesBefore.includes('autocomplete__menu--hidden')).toBe(true)
-
-    const arrowElement = component.querySelector('.autocomplete__dropdown-arrow-down')
-    arrowElement.dispatchEvent(new Event('click'))
-
-    await wait()
-
-    const menuElementClassesAfter = Array.from(menuElement.classList)
-    expect(menuElementClassesAfter.includes('autocomplete__menu--visible')).toBe(true)
-    expect(menuElementClassesAfter.includes('autocomplete__menu--hidden')).toBe(false)
-  })
-})
-
-const wait = async () => await new Promise(resolve => setTimeout(resolve, 100))
diff --git a/spec/javascripts/modules/accessible-autocomplete-spec.js b/spec/javascripts/modules/accessible-autocomplete-spec.js
new file mode 100644
index 000000000..8d32cb0f1
--- /dev/null
+++ b/spec/javascripts/modules/accessible-autocomplete-spec.js
@@ -0,0 +1,93 @@
+describe('GOVUK.Modules.AccessibleAutocomplete', function () {
+  let component, module, autocompleteInput, selectInput
+
+  beforeEach(async function () {
+    component = document.createElement('div')
+    component.setAttribute('data-module', 'accessible-autocomplete')
+    component.innerHTML = `
+      <div class="govuk-form-group gem-c-select">
+        <label class="govuk-label govuk-label--m" for="new_permission_id">Add a permission</label>
+        <div id="hint-1234" class="gem-c-hint govuk-hint">
+          Search for the permission you want to add.
+        </div>
+        <select name="application[new_permission_id]" id="new_permission_id" class="govuk-select" aria-describedby="hint-1234">
+          <option value=""></option>
+          <option value="1">permission-1</option>
+          <option value="2">permission-2</option>
+          <option value="3">permission-3</option>
+        </select>
+      </div>
+      <div class="govuk-button-group">
+        <button class="gem-c-button govuk-button js-autocomplete__add-button" type="submit" aria-label="Add permission">Add</button>
+        <button class="gem-c-button govuk-button js-autocomplete__add-and-finish-button" type="submit" aria-label="Add permission and finish">Add and finish</button>
+        <button class="gem-c-button govuk-button govuk-button--secondary js-autocomplete__clear-button" type="button">Clear selection</button>
+      </div>
+      <input type="hidden" name="application[add_more]" id="application_add_more" value="false" autocomplete="off">
+    `
+
+    module = new GOVUK.Modules.AccessibleAutocomplete(component)
+    module.init()
+
+    autocompleteInput = component.querySelector('.autocomplete__input')
+    selectInput = component.querySelector('select')
+
+    autocompleteInput.value = 'per'
+    await wait()
+
+    expect(selectInput.value).toBe('')
+    const firstAutocompleteListItem = component.querySelector('#new_permission_id__option--0')
+    firstAutocompleteListItem.click()
+    expect(autocompleteInput.value).toBe('permission-1')
+    expect(selectInput.value).toBe('1')
+  })
+
+  it('opens the menu when clicking the arrow', async function () {
+    const menuElement = component.querySelector('.autocomplete__menu')
+    const menuElementClassesBefore = Array.from(menuElement.classList)
+    expect(menuElementClassesBefore.includes('autocomplete__menu--visible')).toBe(false)
+    expect(menuElementClassesBefore.includes('autocomplete__menu--hidden')).toBe(true)
+
+    const arrowElement = component.querySelector('.autocomplete__dropdown-arrow-down')
+    arrowElement.dispatchEvent(new Event('click'))
+
+    await wait()
+
+    const menuElementClassesAfter = Array.from(menuElement.classList)
+    expect(menuElementClassesAfter.includes('autocomplete__menu--visible')).toBe(true)
+    expect(menuElementClassesAfter.includes('autocomplete__menu--hidden')).toBe(false)
+  })
+
+  it("resets the value of the select element when it no longer matches what's shown in the autocomplete input", async function () {
+    autocompleteInput.value = 'permission-'
+    autocompleteInput.dispatchEvent(new KeyboardEvent('keyup'))
+    await wait()
+
+    expect(selectInput.value).toBe('')
+  })
+
+  it('clears the value of the select and autocomplete elements when clicking the clear button', async function () {
+    const clearButton = component.querySelector('.js-autocomplete__clear-button')
+    clearButton.click()
+    await wait()
+
+    expect(component.querySelector('select').value).toBe('')
+  })
+
+  it('clears the value of the select and autocomplete elements when hitting space on the clear button', async function () {
+    const clearButton = component.querySelector('.js-autocomplete__clear-button')
+    clearButton.dispatchEvent(new KeyboardEvent('keydown', { key: ' ' }))
+    await wait()
+
+    expect(selectInput.value).toBe('')
+  })
+
+  it('clears the value of the select and autocomplete elements when hitting enter on the clear button', async function () {
+    const clearButton = component.querySelector('.js-autocomplete__clear-button')
+    clearButton.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter' }))
+    await wait()
+
+    expect(selectInput.value).toBe('')
+  })
+})
+
+const wait = async () => await new Promise(resolve => setTimeout(resolve, 1000))
diff --git a/test/integration/inviting_users_test.rb b/test/integration/inviting_users_test.rb
index dd356f865..0ad9dc12a 100644
--- a/test/integration/inviting_users_test.rb
+++ b/test/integration/inviting_users_test.rb
@@ -384,132 +384,4 @@ class InvitingUsersTest < ActionDispatch::IntegrationTest
       end
     end
   end
-
-  context "with JavaScript enabled" do
-    setup do
-      use_javascript_driver
-
-      create(:organisation, name: "ABCDEF")
-      create(:organisation, name: "GHIJKL")
-      @organisation = create(:organisation, name: "MNOPQR")
-      create(:organisation, name: "STUVWX")
-      create(:organisation, name: "YZ1234")
-
-      superadmin = create(:superadmin_user)
-      visit root_path
-      signin_with(superadmin)
-
-      visit new_user_invitation_path
-      fill_in "Name", with: "H from Steps"
-      fill_in "Email", with: "h@from.steps"
-      select "Superadmin", from: "Role"
-
-      @autocomplete_input_element = find(".autocomplete__input")
-      @select_element = find("#user_organisation_id-select", visible: false)
-    end
-
-    should "be able to invite a user" do
-      assert_select_with_autocomplete(
-        autocomplete_input_element: @autocomplete_input_element,
-        select_element: @select_element,
-        option_text: @organisation.name,
-        option_value: @organisation.id.to_s,
-        unique_partial_string: "MNO",
-      )
-
-      click_button "Create user and send email"
-
-      new_user = User.find_by(email: "h@from.steps", role: Roles::Superadmin.name)
-      assert_not_nil new_user
-      assert_equal new_user.organisation, @organisation
-    end
-
-    should("not show an 'Add' button") { assert_no_selector "button", text: "Add" }
-
-    should "reset the value of the select element when it no longer matches what's shown in the autocomplete input" do
-      assert_select_with_autocomplete(
-        autocomplete_input_element: @autocomplete_input_element,
-        select_element: @select_element,
-        option_text: @organisation.name,
-        option_value: @organisation.id.to_s,
-        unique_partial_string: "MNO",
-      )
-
-      assert_resets_select_when_desynced_with_autocomplete(
-        autocomplete_input_element: @autocomplete_input_element,
-        select_element: @select_element,
-        option_text: @organisation.name,
-        unique_partial_string: "MNOP",
-      )
-
-      click_button "Create user and send email"
-
-      new_user = User.find_by(email: "h@from.steps", role: Roles::Superadmin.name)
-      assert_not_nil new_user
-      assert_nil new_user.organisation
-    end
-
-    should "clear the value of the select and autocomplete elements when clicking the clear button" do
-      assert_select_with_autocomplete(
-        autocomplete_input_element: @autocomplete_input_element,
-        select_element: @select_element,
-        option_text: @organisation.name,
-        option_value: @organisation.id.to_s,
-        unique_partial_string: "MNO",
-      )
-
-      assert_clear_autocomplete_selection_by_click(
-        autocomplete_input_element: @autocomplete_input_element,
-        select_element: @select_element,
-      )
-
-      click_button "Create user and send email"
-
-      new_user = User.find_by(email: "h@from.steps", role: Roles::Superadmin.name)
-      assert_not_nil new_user
-      assert_nil new_user.organisation
-    end
-
-    should "clear the value of the select and autocomplete elements when hitting space on the clear button" do
-      assert_select_with_autocomplete(
-        autocomplete_input_element: @autocomplete_input_element,
-        select_element: @select_element,
-        option_text: @organisation.name,
-        option_value: @organisation.id.to_s,
-        unique_partial_string: "MNO",
-      )
-
-      assert_clear_autocomplete_selection_by_space(
-        autocomplete_input_element: @autocomplete_input_element,
-        select_element: @select_element,
-      )
-
-      click_button "Create user and send email"
-
-      new_user = User.find_by(email: "h@from.steps", role: Roles::Superadmin.name)
-      assert_not_nil new_user
-      assert_nil new_user.organisation
-    end
-
-    should "clear the value of the select and autocomplete elements when hitting enter on the clear button" do
-      assert_select_with_autocomplete(
-        autocomplete_input_element: @autocomplete_input_element,
-        select_element: @select_element,
-        option_text: @organisation.name,
-        option_value: @organisation.id.to_s,
-        unique_partial_string: "MNO",
-      )
-
-      assert_clear_autocomplete_selection_by_enter(
-        autocomplete_input_element: @autocomplete_input_element,
-        select_element: @select_element,
-      )
-
-      click_button "Create user and send email"
-
-      new_user = User.find_by(email: "h@from.steps", role: Roles::Superadmin.name)
-      assert_not_nil new_user
-      assert_nil new_user.organisation
-    end
-  end
 end
diff --git a/test/integration/updating_permissions_for_apps_with_many_permissions_test.rb b/test/integration/updating_permissions_for_apps_with_many_permissions_test.rb
index 44c097991..93c8bdfe7 100644
--- a/test/integration/updating_permissions_for_apps_with_many_permissions_test.rb
+++ b/test/integration/updating_permissions_for_apps_with_many_permissions_test.rb
@@ -3,208 +3,84 @@
 class UpdatingPermissionsForAppsWithManyPermissionsTest < ActionDispatch::IntegrationTest
   # Also see: Account::UpdatingPermissionsTest, Users::UpdatingPermissionsTest
 
-  def shared_setup
-    @grantee_is_self = rand(2).zero?
-
-    @application = create(:application)
-    @old_permissions_to_keep = create_list(:supported_permission, 3, application: @application)
-    @old_permission_to_remove_without_javascript = create(:supported_permission, application: @application)
-    @new_permissions_to_leave = create_list(:supported_permission, 4, application: @application)
-    @new_permission_to_grant = create(:supported_permission, application: @application, name: "adding")
-
-    @current_user = create(:superadmin_user)
-    @grantee = @grantee_is_self ? @current_user : create(:user)
-    @grantee.grant_application_signin_permission(@application)
-    @grantee.grant_application_permissions(@application, [*@old_permissions_to_keep, @old_permission_to_remove_without_javascript].map(&:name))
-
-    visit new_user_session_path
-    signin_with @current_user
-  end
-
-  def assert_select_permission_to_grant_with_javascript
-    @grantee_is_self ? assert_edit_self : assert_edit_other_user(@grantee)
-
-    click_link "Update permissions for #{@application.name}"
+  context "with apps that have more than eight permissions" do
+    setup do
+      @grantee_is_self = rand(2).zero?
+
+      @application = create(:application)
+      @old_permissions_to_keep = create_list(:supported_permission, 3, application: @application)
+      @old_permission_to_remove_without_javascript = create(:supported_permission, application: @application)
+      @new_permissions_to_leave = create_list(:supported_permission, 4, application: @application)
+      @new_permission_to_grant = create(:supported_permission, application: @application, name: "adding")
+
+      @current_user = create(:superadmin_user)
+      @grantee = @grantee_is_self ? @current_user : create(:user)
+      @grantee.grant_application_signin_permission(@application)
+      @grantee.grant_application_permissions(@application, [*@old_permissions_to_keep, @old_permission_to_remove_without_javascript].map(&:name))
+
+      visit new_user_session_path
+      signin_with @current_user
+    end
 
-    @autocomplete_input_element = find(".autocomplete__input")
-    @select_element = find("#new_permission_id-select", visible: false)
+    should "be able to grant permissions" do
+      @grantee_is_self ? assert_edit_self : assert_edit_other_user(@grantee)
 
-    assert_select_with_autocomplete(
-      autocomplete_input_element: @autocomplete_input_element,
-      select_element: @select_element,
-      option_text: @new_permission_to_grant.name,
-      option_value: @new_permission_to_grant.id.to_s,
-      unique_partial_string: "add",
-    )
-  end
+      click_link "Update permissions for #{@application.name}"
+      select @new_permission_to_grant.name
+      click_button "Add and finish"
 
-  def assert_permissions_unchanged
-    expected_permissions = [*@old_permissions_to_keep, @old_permission_to_remove_without_javascript]
-    expected_permissions.each { |expected_permission| assert @grantee.has_permission?(expected_permission) }
+      click_link "Update permissions for #{@application.name}"
+      uncheck @old_permission_to_remove_without_javascript.name
+      click_button "Update permissions"
 
-    unexpected_permissions = [*@new_permissions_to_leave, @new_permission_to_grant]
-    unexpected_permissions.each { |unexpected_permission| assert_not @grantee.has_permission?(unexpected_permission) }
-  end
+      expected_permissions = [*@old_permissions_to_keep, @new_permission_to_grant]
+      assert_flash_content(expected_permissions.map(&:name))
+      expected_permissions.each { |expected_permission| assert @grantee.has_permission?(expected_permission) }
 
-  context "with apps that have more than eight permissions" do
-    context "with JavaScript disabled" do
-      setup { shared_setup }
+      unexpected_permissions = [@old_permission_to_remove_without_javascript, *@new_permissions_to_leave]
+      refute_flash_content(unexpected_permissions.map(&:name))
+      unexpected_permissions.each { |unexpected_permission| assert_not @grantee.has_permission?(unexpected_permission) }
+    end
 
-      should "be able to grant permissions" do
+    context "when the grantee already has some but not all permissions" do
+      should "display the new and current permissions forms" do
         @grantee_is_self ? assert_edit_self : assert_edit_other_user(@grantee)
 
         click_link "Update permissions for #{@application.name}"
-        select @new_permission_to_grant.name
-        click_button "Add and finish"
-
-        click_link "Update permissions for #{@application.name}"
-        uncheck @old_permission_to_remove_without_javascript.name
-        click_button "Update permissions"
 
-        expected_permissions = [*@old_permissions_to_keep, @new_permission_to_grant]
-        assert_flash_content(expected_permissions.map(&:name))
-        expected_permissions.each { |expected_permission| assert @grantee.has_permission?(expected_permission) }
-
-        unexpected_permissions = [@old_permission_to_remove_without_javascript, *@new_permissions_to_leave]
-        refute_flash_content(unexpected_permissions.map(&:name))
-        unexpected_permissions.each { |unexpected_permission| assert_not @grantee.has_permission?(unexpected_permission) }
-      end
-
-      context "when the grantee already has some but not all permissions" do
-        should "display the new and current permissions forms" do
-          @grantee_is_self ? assert_edit_self : assert_edit_other_user(@grantee)
-
-          click_link "Update permissions for #{@application.name}"
-
-          assert_selector ".govuk-label", text: "Add a permission"
-          assert_selector "legend", text: "Current permissions"
-        end
-      end
-
-      context "when the grantee has all permissions" do
-        setup do
-          @grantee.grant_application_permissions(@application, [*@new_permissions_to_leave, @new_permission_to_grant].map(&:name))
-        end
-
-        should "only display the current permissions form" do
-          @grantee_is_self ? assert_edit_self : assert_edit_other_user(@grantee)
-
-          click_link "Update permissions for #{@application.name}"
-
-          assert_no_selector ".govuk-label", text: "Add a permission"
-          assert_selector "legend", text: "Current permissions"
-        end
-      end
-
-      context "when the grantee has no permissions" do
-        setup do
-          old_permission_ids = [*@old_permissions_to_keep, @old_permission_to_remove_without_javascript].pluck(:id)
-          UserApplicationPermission.where(user: @grantee, supported_permission_id: old_permission_ids).destroy_all
-        end
-
-        should "only display the new permissions form" do
-          @grantee_is_self ? assert_edit_self : assert_edit_other_user(@grantee)
-
-          click_link "Update permissions for #{@application.name}"
-
-          assert_selector ".govuk-label", text: "Add a permission"
-          assert_no_selector "legend", text: "Current permissions"
-        end
+        assert_selector ".govuk-label", text: "Add a permission"
+        assert_selector "legend", text: "Current permissions"
       end
     end
 
-    context "with JavaScript enabled" do
+    context "when the grantee has all permissions" do
       setup do
-        use_javascript_driver
-        shared_setup
+        @grantee.grant_application_permissions(@application, [*@new_permissions_to_leave, @new_permission_to_grant].map(&:name))
       end
 
-      should "be able to grant permissions" do
-        assert_select_permission_to_grant_with_javascript
-
-        click_button "Add and finish"
-
-        expected_permissions = [*@old_permissions_to_keep, @new_permission_to_grant, @old_permission_to_remove_without_javascript]
-        assert_flash_content(expected_permissions.map(&:name))
-        expected_permissions.each { |expected_permission| assert @grantee.has_permission?(expected_permission) }
-
-        unexpected_permissions = @new_permissions_to_leave
-        refute_flash_content(unexpected_permissions.map(&:name))
-        unexpected_permissions.each { |unexpected_permission| assert_not @grantee.has_permission?(unexpected_permission) }
-      end
-
-      should "grant permissions then redirect back to the form when clicking 'Add'" do
-        assert_select_permission_to_grant_with_javascript
-
-        click_button "Add"
-
-        expected_permissions = [*@old_permissions_to_keep, @new_permission_to_grant, @old_permission_to_remove_without_javascript]
-        expected_permissions.each { |expected_permission| assert @grantee.has_permission?(expected_permission) }
-
-        unexpected_permissions = @new_permissions_to_leave
-        unexpected_permissions.each { |unexpected_permission| assert_not @grantee.has_permission?(unexpected_permission) }
-
-        h1_content = @grantee_is_self ? "Update permissions for #{@application.name}" : "Update #{@grantee.name}'s permissions for #{@application.name}"
-        assert page.has_selector?("h1", text: h1_content)
-        assert_flash_content("You have successfully added the permission '#{@new_permission_to_grant.name}'.")
-      end
-
-      should "reset the value of the select element when it no longer matches what's shown in the autocomplete input" do
-        assert_select_permission_to_grant_with_javascript
-
-        assert_resets_select_when_desynced_with_autocomplete(
-          autocomplete_input_element: @autocomplete_input_element,
-          select_element: @select_element,
-          option_text: @new_permission_to_grant.name,
-          unique_partial_string: "addin",
-        )
-
-        click_button "Add and finish"
-
-        assert_permissions_unchanged
-        assert_flash_content("You must select a permission.")
-      end
-
-      should "clear the value of the select and autocomplete elements when clicking the clear button" do
-        assert_select_permission_to_grant_with_javascript
-
-        assert_clear_autocomplete_selection_by_click(
-          autocomplete_input_element: @autocomplete_input_element,
-          select_element: @select_element,
-        )
+      should "only display the current permissions form" do
+        @grantee_is_self ? assert_edit_self : assert_edit_other_user(@grantee)
 
-        click_button "Add and finish"
+        click_link "Update permissions for #{@application.name}"
 
-        assert_permissions_unchanged
-        assert_flash_content("You must select a permission.")
+        assert_no_selector ".govuk-label", text: "Add a permission"
+        assert_selector "legend", text: "Current permissions"
       end
+    end
 
-      should "clear the value of the select and autocomplete elements when hitting space on the clear button" do
-        assert_select_permission_to_grant_with_javascript
-
-        assert_clear_autocomplete_selection_by_space(
-          autocomplete_input_element: @autocomplete_input_element,
-          select_element: @select_element,
-        )
-
-        click_button "Add and finish"
-
-        assert_permissions_unchanged
-        assert_flash_content("You must select a permission.")
+    context "when the grantee has no permissions" do
+      setup do
+        old_permission_ids = [*@old_permissions_to_keep, @old_permission_to_remove_without_javascript].pluck(:id)
+        UserApplicationPermission.where(user: @grantee, supported_permission_id: old_permission_ids).destroy_all
       end
 
-      should "clear the value of the select and autocomplete elements when hitting enter on the clear button" do
-        assert_select_permission_to_grant_with_javascript
-
-        assert_clear_autocomplete_selection_by_enter(
-          autocomplete_input_element: @autocomplete_input_element,
-          select_element: @select_element,
-        )
+      should "only display the new permissions form" do
+        @grantee_is_self ? assert_edit_self : assert_edit_other_user(@grantee)
 
-        click_button "Add and finish"
+        click_link "Update permissions for #{@application.name}"
 
-        assert_permissions_unchanged
-        assert_flash_content("You must select a permission.")
+        assert_selector ".govuk-label", text: "Add a permission"
+        assert_no_selector "legend", text: "Current permissions"
       end
     end
   end
diff --git a/test/support/autocomplete_helpers.rb b/test/support/autocomplete_helpers.rb
deleted file mode 100644
index 4261b80ce..000000000
--- a/test/support/autocomplete_helpers.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-module AutocompleteHelpers
-  def assert_select_with_autocomplete(
-    autocomplete_input_element:,
-    select_element:,
-    option_text:,
-    option_value:,
-    unique_partial_string:
-  )
-    assert_equal "", autocomplete_input_element.value
-    assert_equal "", select_element.value
-
-    # when I type a few characters from the option that are unique to that option
-    autocomplete_input_element.fill_in with: unique_partial_string
-    autocomplete_option = find(".autocomplete__option")
-
-    # the autcomplete value reflects what I typed, a matching option appears, but the select element remains empty
-    assert_equal unique_partial_string, autocomplete_input_element.value
-    assert_equal option_text, autocomplete_option.text
-    assert_equal "", select_element.value
-
-    # when I click on the matching option
-    autocomplete_option.click
-
-    # the autocomplete and select elements reflect my selection
-    assert_equal option_text, autocomplete_input_element.value
-    assert_equal option_value, select_element.value
-  end
-
-  def assert_resets_select_when_desynced_with_autocomplete(
-    autocomplete_input_element:,
-    select_element:,
-    option_text:,
-    unique_partial_string:
-  )
-    autocomplete_input_element.fill_in with: unique_partial_string
-    autocomplete_option = find(".autocomplete__option")
-
-    assert_equal unique_partial_string, autocomplete_input_element.value
-    assert_equal option_text, autocomplete_option.text
-    assert_equal "", select_element.value
-
-    autocomplete_input_element.native.send_keys :escape
-  end
-
-  def assert_clear_autocomplete_selection_by_click(autocomplete_input_element:, select_element:)
-    click_button "Clear selection"
-
-    assert_equal "", autocomplete_input_element.value
-    assert_equal "", select_element.value
-  end
-
-  def assert_clear_autocomplete_selection_by_space(autocomplete_input_element:, select_element:)
-    clear_button = find(".js-autocomplete__clear-button")
-    clear_button.native.send_keys :space
-
-    assert_equal "", autocomplete_input_element.value
-    assert_equal "", select_element.value
-  end
-
-  def assert_clear_autocomplete_selection_by_enter(autocomplete_input_element:, select_element:)
-    clear_button = find(".js-autocomplete__clear-button")
-    clear_button.native.send_keys :enter
-
-    assert_equal "", autocomplete_input_element.value
-    assert_equal "", select_element.value
-  end
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 2e50df3a5..e310ca3f2 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -90,7 +90,6 @@ def assert_not_authorised
 require "support/removing_access_helpers"
 require "support/updating_permissions_helpers"
 require "support/flash_helpers"
-require "support/autocomplete_helpers"
 
 class ActiveRecord::Base
   mattr_accessor :shared_connection
@@ -118,7 +117,6 @@ class ActionDispatch::IntegrationTest
   include RemovingAccessHelpers
   include UpdatingPermissionsHelpers
   include FlashHelpers
-  include AutocompleteHelpers
 
   def assert_response_contains(content)
     assert page.has_content?(content), "Expected to find '#{content}' in:\n#{page.text}"