diff --git a/app/client/cypress/e2e/Regression/ClientSide/Branding/Branding_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Branding/Branding_spec.js
index 2cc76315564e..fe7929010443 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Branding/Branding_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Branding/Branding_spec.js
@@ -32,7 +32,7 @@ const locators = {
   AdminSettingsColorInputShades: ".t--color-input-shades",
   businessTag: ".business-tag",
   upgradeBanner: ".upgrade-banner",
-  upgradeButton: "[data-testid='t--branding-upgrade-button']",
+  upgradeButton: "[data-testid='t--button-upgrade']",
 };
 
 describe("Branding", { tags: ["@tag.Settings"] }, () => {
diff --git a/app/client/cypress/e2e/Regression/Enterprise/AdminSettings/Admin_settings_spec.js b/app/client/cypress/e2e/Regression/Enterprise/AdminSettings/Admin_settings_spec.js
index 597673d11399..9749abea57de 100644
--- a/app/client/cypress/e2e/Regression/Enterprise/AdminSettings/Admin_settings_spec.js
+++ b/app/client/cypress/e2e/Regression/Enterprise/AdminSettings/Admin_settings_spec.js
@@ -99,7 +99,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
       cy.get(adminsSettings.branding).click();
       cy.url().should("contain", adminSettingsHelper.routes.BRANDING);
       cy.get(adminsSettings.brandingSubmitButton).should("be.disabled");
-      cy.xpath(adminsSettings.upgrade).click();
+      agHelper.GetNClick(adminsSettings.upgrade);
       cy.get("@customerPortalPage").should("be.called");
       cy.wait(2000);
       cy.go(-1);
@@ -120,7 +120,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
       cy.get(adminsSettings.accessControl).click();
       cy.url().should("contain", adminSettingsHelper.routes.ACCESS_CONTROL);
       cy.stubCustomerPortalPage();
-      cy.xpath(adminsSettings.upgrade).click();
+      agHelper.GetNClick(adminsSettings.upgrade);
       cy.get("@customerPortalPage").should("be.called");
       cy.wait(2000);
       agHelper.VisitNAssert(
@@ -135,7 +135,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
       cy.get(adminsSettings.auditLogs).click();
       cy.url().should("contain", adminSettingsHelper.routes.AUDIT_LOGS);
       cy.stubCustomerPortalPage();
-      cy.xpath(adminsSettings.upgrade).click();
+      agHelper.GetNClick(adminsSettings.upgrade);
       cy.get("@customerPortalPage").should("be.called");
       cy.wait(2000);
       agHelper.VisitNAssert(
@@ -150,7 +150,7 @@ describe("Admin settings page", { tags: ["@tag.Settings"] }, function () {
       cy.get(adminsSettings.provisioning).click();
       cy.url().should("contain", adminSettingsHelper.routes.PROVISIONING);
       cy.stubPricingPage();
-      cy.xpath(adminsSettings.upgrade).click();
+      agHelper.GetNClick(adminsSettings.upgrade);
       cy.get("@pricingPage").should("be.called");
       cy.wait(2000);
       cy.go(-1);
diff --git a/app/client/cypress/locators/AdminsSettings.js b/app/client/cypress/locators/AdminsSettings.js
index 5e76d7895947..ec2dc30b9371 100644
--- a/app/client/cypress/locators/AdminsSettings.js
+++ b/app/client/cypress/locators/AdminsSettings.js
@@ -27,7 +27,7 @@ export default {
   formSignupDisabled: "[data-testid='APPSMITH_SIGNUP_DISABLED']",
   formLoginDisabled: "[data-testid='APPSMITH_FORM_LOGIN_DISABLED']",
   embedSettings: ".t--admin-settings-APPSMITH_ALLOWED_FRAME_ANCESTORS",
-  upgrade: "//button//span[text()='Upgrade']",
+  upgrade: "[data-testid='t--button-upgrade']",
   accessControl: ".t--settings-category-access-control",
   auditLogs: ".t--settings-category-audit-logs",
   provisioning: ".t--settings-category-provisioning",
diff --git a/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx b/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx
index ac66bdbd2ebe..744e5ae97efc 100644
--- a/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx
+++ b/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx
@@ -49,11 +49,7 @@ const UpgradeBanner = () => {
           </StyledSettingsSubHeader>
         </main>
         <aside>
-          <Button
-            data-testid="t--branding-upgrade-button"
-            onClick={onUpgrade}
-            size="md"
-          >
+          <Button data-testid="t--button-upgrade" onClick={onUpgrade} size="md">
             Upgrade
           </Button>
         </aside>