diff --git a/e2e/cypress/integration/account_settings/display/code_theme_colors_spec.js b/e2e/cypress/integration/account_settings/display/code_theme_colors_spec.js
index 24fa1f166e55..932302687a0f 100644
--- a/e2e/cypress/integration/account_settings/display/code_theme_colors_spec.js
+++ b/e2e/cypress/integration/account_settings/display/code_theme_colors_spec.js
@@ -10,6 +10,8 @@
 // Stage: @prod
 // Group: @account_setting
 
+import * as TIMEOUTS from '../../../fixtures/timeouts';
+
 describe('Account Settings', () => {
     before(() => {
         // # Login as new user, visit town-square and post a message
@@ -42,9 +44,8 @@ describe('Account Settings', () => {
             verifyLastPostStyle(theme);
 
             // # Save and close settings modal
-            cy.get('#saveSetting').click();
-            cy.get('#accountSettingsHeader > .close').click();
-            cy.get('#accountSettingsHeader').should('be.hidden');
+            cy.get('#saveSetting').click().wait(TIMEOUTS.HALF_SEC);
+            cy.uiClose();
 
             // * Verify that the styles remain after saving and closing modal
             verifyLastPostStyle(theme);
@@ -71,9 +72,7 @@ function verifyLastPostStyle(codeTheme) {
 
 function navigateToThemeSettings() {
     // Change theme to desired theme (keeps settings modal open)
-    cy.toAccountSettingsModal();
-    cy.get('#displayButton').click();
-    cy.get('#displaySettingsTitle').should('exist');
+    cy.uiOpenAccountSettingsModal('Display');
 
     // Open edit theme
     cy.get('#themeTitle').should('be.visible');
diff --git a/e2e/cypress/integration/enterprise/integrations/incoming_webhook_spec.js b/e2e/cypress/integration/enterprise/integrations/incoming_webhook_spec.js
index 0c47f2b8109b..01e1fb712d10 100644
--- a/e2e/cypress/integration/enterprise/integrations/incoming_webhook_spec.js
+++ b/e2e/cypress/integration/enterprise/integrations/incoming_webhook_spec.js
@@ -8,7 +8,7 @@
 // ***************************************************************
 
 // Stage: @prod
-// Group: @enterprise @incoming_webhook @not_cloud
+// Group: @enterprise @elasticsearch @incoming_webhook @not_cloud
 
 import * as TIMEOUTS from '../../../fixtures/timeouts';
 import {
diff --git a/e2e/cypress/integration/enterprise/ldap_group/channel_modes_spec.js b/e2e/cypress/integration/enterprise/ldap_group/channel_modes_spec.js
index 56d642f16e69..e9900d611de4 100644
--- a/e2e/cypress/integration/enterprise/ldap_group/channel_modes_spec.js
+++ b/e2e/cypress/integration/enterprise/ldap_group/channel_modes_spec.js
@@ -10,7 +10,7 @@
 // Stage: @prod
 // Group: @enterprise @ldap_group
 
-describe('Test channel public/private toggle', () => {
+describe('LDAP Group Sync - Test channel public/private toggle', () => {
     let testTeam;
 
     before(() => {
@@ -20,10 +20,10 @@ describe('Test channel public/private toggle', () => {
         // Enable LDAP and LDAP group sync
         cy.apiUpdateConfig({LdapSettings: {Enable: true}});
 
-        // # Check and run LDAP Sync job
-        if (Cypress.env('runLDAPSync')) {
-            cy.checkRunLDAPSync();
-        }
+        // # Test LDAP configuration and server connection
+        // # Synchronize user attributes
+        cy.apiLDAPTest();
+        cy.apiLDAPSync();
 
         // # Init test setup
         cy.apiInitSetup().then(({team}) => {
@@ -31,7 +31,7 @@ describe('Test channel public/private toggle', () => {
         });
     });
 
-    it('Verify that System Admin can change channel privacy using toggle', () => {
+    it('MM-T4003_1 Verify that System Admin can change channel privacy using toggle', () => {
         cy.apiCreateChannel(testTeam.id, 'test-channel', 'Test Channel').then(({channel}) => {
             assert(channel.type === 'O');
             cy.visit(`/admin_console/user_management/channels/${channel.id}`);
@@ -53,7 +53,7 @@ describe('Test channel public/private toggle', () => {
         });
     });
 
-    it('Verify that resetting sync toggle doesn\'t alter channel privacy toggle', () => {
+    it('MM-T4003_2 Verify that resetting sync toggle doesn\'t alter channel privacy toggle', () => {
         cy.apiCreateChannel(testTeam.id, 'test-channel', 'Test Channel').then(({channel}) => {
             assert(channel.type === 'O');
             cy.visit(`/admin_console/user_management/channels/${channel.id}`);
@@ -68,7 +68,7 @@ describe('Test channel public/private toggle', () => {
         });
     });
 
-    it('Verify that toggles are disabled for default channel', () => {
+    it('MM-T4003_3 Verify that toggles are disabled for default channel', () => {
         cy.visit(`/${testTeam.name}/channels/town-square`);
         cy.getCurrentChannelId().then((id) => {
             cy.visit(`/admin_console/user_management/channels/${id}`);
diff --git a/e2e/cypress/integration/enterprise/ldap_group/groups_assign_roles_spec.js b/e2e/cypress/integration/enterprise/ldap_group/groups_assign_roles_spec.js
index a3e02a08fb0f..5bbebd625ddb 100644
--- a/e2e/cypress/integration/enterprise/ldap_group/groups_assign_roles_spec.js
+++ b/e2e/cypress/integration/enterprise/ldap_group/groups_assign_roles_spec.js
@@ -48,7 +48,7 @@ const getChannelsAssociatedToGroupAndUnlink = (groupId) => {
     });
 };
 
-describe('System Console', () => {
+describe('LDAP Group Sync', () => {
     before(() => {
         // * Check if server has license for LDAP Groups
         cy.apiRequireLicenseForFeature('LDAPGroups');
@@ -56,13 +56,13 @@ describe('System Console', () => {
         // Enable LDAP
         cy.apiUpdateConfig({LdapSettings: {Enable: true}});
 
-        // # Check and run LDAP Sync job
-        if (Cypress.env('runLDAPSync')) {
-            cy.checkRunLDAPSync();
-        }
+        // # Test LDAP configuration and server connection
+        // # Synchronize user attributes
+        cy.apiLDAPTest();
+        cy.apiLDAPSync();
     });
 
-    it('MM-20058 - System Admin can map roles to teams and channels via group configuration page', () => {
+    it('MM-T2668 Team admin role can be set and saved', () => {
         // # Go to system admin page and to team configuration page
         cy.visit('/admin_console/user_management/groups');
         cy.get('#developers_group').then((el) => {