diff --git a/smoke-test/tests/cypress/cypress/e2e/glossary/glossary.js b/smoke-test/tests/cypress/cypress/e2e/glossary/glossary.js
index dbc4e1db72..b0e24d5346 100644
--- a/smoke-test/tests/cypress/cypress/e2e/glossary/glossary.js
+++ b/smoke-test/tests/cypress/cypress/e2e/glossary/glossary.js
@@ -1,6 +1,6 @@
 const urn = "urn:li:dataset:(urn:li:dataPlatform:hive,cypress_logging_events,PROD)";
 const datasetName = "cypress_logging_events";
-const glossaryTerm = "CypressGlosssaryTerm";
+const glossaryTerm = "CypressGlossaryTerm";
 const glossaryTermGroup = "CypressGlossaryGroup";
 
 describe("glossary", () => {
@@ -8,9 +8,9 @@ describe("glossary", () => {
         cy.loginWithCredentials();
         cy.goToGlossaryList();
         cy.clickOptionWithText("Add Term");
-        cy.addViaModal(glossaryTerm, "Create Glossary Term", glossaryTerm);
+        cy.addViaModal(glossaryTerm, "Create Glossary Term", glossaryTerm, "glossary-entity-modal-create-button");
         cy.clickOptionWithText("Add Term Group");
-        cy.addViaModal(glossaryTermGroup, "Create Term Group", glossaryTermGroup);
+        cy.addViaModal(glossaryTermGroup, "Create Term Group", glossaryTermGroup, "glossary-entity-modal-create-button");
         cy.addTermToDataset(urn, datasetName, glossaryTerm);
         cy.waitTextVisible(glossaryTerm)
         cy.goToGlossaryList();
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/managed_ingestion.js b/smoke-test/tests/cypress/cypress/e2e/mutations/managed_ingestion.js
index 05f94c94bf..c355aaabc3 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/managed_ingestion.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/managed_ingestion.js
@@ -26,7 +26,7 @@ describe("run managed ingestion", () => {
         cy.enterTextInTestId('source-name-input', testName)
         cy.clickOptionWithText("Advanced")
         cy.enterTextInTestId('cli-version-input', cli_version)
-        cy.clickOptionWithText("Save & Run")
+        cy.clickOptionWithTextToScrollintoView("Save & Run")
         cy.waitTextVisible(testName)
 
         cy.contains(testName).parent().within(() => {
diff --git a/smoke-test/tests/cypress/cypress/support/commands.js b/smoke-test/tests/cypress/cypress/support/commands.js
index ba5600b79f..f32512aff4 100644
--- a/smoke-test/tests/cypress/cypress/support/commands.js
+++ b/smoke-test/tests/cypress/cypress/support/commands.js
@@ -183,10 +183,10 @@ Cypress.Commands.add("addViaFormModal", (text, modelHeader) => {
   cy.get(".ant-modal-footer > button:nth-child(2)").click();
 });
 
-Cypress.Commands.add("addViaModal", (text, modelHeader,value) => {
+Cypress.Commands.add("addViaModal", (text, modelHeader, value, dataTestId) => {
   cy.waitTextVisible(modelHeader);
   cy.get(".ant-input-affix-wrapper > input[type='text']").first().type(text);
-  cy.get(".ant-modal-footer > button:nth-child(2)").click();
+  cy.get('[data-testid="' + dataTestId + '"]').click();
   cy.contains(value).should('be.visible');
 });