diff --git a/app/assets/javascripts/integrations/edit/components/integration_form.vue b/app/assets/javascripts/integrations/edit/components/integration_form.vue
index efd5f395f7f156a3b2eedd6906180a0976f8c64f..eb3a17da974ef4e677432f6c19c9ecfd3876e2d3 100644
--- a/app/assets/javascripts/integrations/edit/components/integration_form.vue
+++ b/app/assets/javascripts/integrations/edit/components/integration_form.vue
@@ -186,7 +186,8 @@ export default {
   <gl-form
     ref="integrationForm"
     method="post"
-    class="gl-mt-6 gl-mb-3 gl-show-field-errors integration-settings-form"
+    class="gl-mt-6 gl-mb-3 gl-show-field-errors"
+    data-testid="integration-settings-form"
     :action="propsSource.formPath"
     :novalidate="!integrationActive"
   >
diff --git a/app/views/shared/_integration_settings.html.haml b/app/views/shared/_integration_settings.html.haml
index 84710b2ecc7077a8780d19738aedec7e157f59b8..6337ac03ac74e84bfd6592a8fd2c44bbe1b59046 100644
--- a/app/views/shared/_integration_settings.html.haml
+++ b/app/views/shared/_integration_settings.html.haml
@@ -1,6 +1,6 @@
 = form_errors(integration)
 
-%div{ data: { testid: "integration-settings-form" } }
+%div
   - if @default_integration
     .js-vue-default-integration-settings{ data: integration_form_data(@default_integration, group: @group, project: @project) }
   .js-vue-integration-settings{ data: integration_form_data(integration, group: @group, project: @project) }
diff --git a/spec/features/projects/integrations/user_activates_jira_spec.rb b/spec/features/projects/integrations/user_activates_jira_spec.rb
index 704e959ff0e17a6ee9833856db6e04e491821f01..942327cdfe8b8543154e35349bea1f5f9fbb84e7 100644
--- a/spec/features/projects/integrations/user_activates_jira_spec.rb
+++ b/spec/features/projects/integrations/user_activates_jira_spec.rb
@@ -42,7 +42,7 @@
         fill_in 'service-password', with: 'password'
         click_test_integration
 
-        page.within('[data-testid="integration-settings-form"]') do
+        within_testid 'integration-settings-form' do
           expect(page).to have_content('This field is required.')
         end
       end
diff --git a/spec/features/projects/settings/slack_application_spec.rb b/spec/features/projects/settings/slack_application_spec.rb
index 79291094aae21488261ac6c58625e2e41e565af3..e2d195cdc263c31e06450e289e206658b96f4327 100644
--- a/spec/features/projects/settings/slack_application_spec.rb
+++ b/spec/features/projects/settings/slack_application_spec.rb
@@ -17,7 +17,7 @@
   it 'I can edit slack integration' do
     visit slack_application_form_path
 
-    within '[data-testid="integration-settings-form"]' do
+    within_testid 'integration-settings-form' do
       click_link 'Edit'
     end
 
@@ -26,7 +26,7 @@
 
     expect(page).to have_content('The project alias was updated successfully')
 
-    within '[data-testid="integration-settings-form"]' do
+    within_testid 'integration-settings-form' do
       expect(page).to have_content('alias-edited')
     end
   end
diff --git a/spec/support/shared_examples/integrations/integration_settings_form.rb b/spec/support/shared_examples/integrations/integration_settings_form.rb
index c665f6a57f1504bff1bce52a02f50e5f63db797c..854e31802dc0007dc5f849e966760beb388df7c9 100644
--- a/spec/support/shared_examples/integrations/integration_settings_form.rb
+++ b/spec/support/shared_examples/integrations/integration_settings_form.rb
@@ -14,7 +14,7 @@
       integrations.each do |integration|
         navigate_to_integration(integration)
 
-        page.within('form.integration-settings-form') do
+        within_testid 'integration-settings-form' do
           expect(page).to have_field('Active', type: 'checkbox', wait: 0),
             "#{integration.title} active field not present"