diff --git a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancement/queries.spec.js b/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancement/queries.spec.js
index d8a076c5b..cae63551a 100644
--- a/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancement/queries.spec.js
+++ b/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancement/queries.spec.js
@@ -14,12 +14,6 @@ const testFixtureHandler = new TestFixtureHandler(
   Cypress.env('openSearchUrl')
 );
 
-const indexSet = [
-  'logstash-2015.09.22',
-  'logstash-2015.09.21',
-  'logstash-2015.09.20',
-];
-
 describe('query enhancement queries', { scrollBehavior: false }, () => {
   before(() => {
     CURRENT_TENANT.newTenant = 'global';
@@ -108,7 +102,7 @@ describe('query enhancement queries', { scrollBehavior: false }, () => {
         `source = timestamp-*`
       );
       cy.waitForSearch();
-      cy.getElementByTestId('queryResultCompleteMsg').click();
+      cy.getElementByTestId(`queryResultCompleteMsg`).should('be.visible');
       cy.get('[class="euiText euiText--small"]').then((text) => cy.log(text));
       cy.verifyHitCount(4);
 
diff --git a/cypress/utils/dashboards/query_enhancement/commands.js b/cypress/utils/dashboards/query_enhancement/commands.js
index 88f852c9b..8f32fcfe3 100644
--- a/cypress/utils/dashboards/query_enhancement/commands.js
+++ b/cypress/utils/dashboards/query_enhancement/commands.js
@@ -31,9 +31,7 @@ Cypress.Commands.add('setSingleLineQueryEditor', (value, submit = true) => {
   }
 });
 
-Cypress.Commands.add('setQueryLanguage', (value, submit = true) => {
-  const opts = { log: false };
-
+Cypress.Commands.add('setQueryLanguage', (value) => {
   Cypress.log({
     name: 'setQueryLanguage',
     displayName: 'set language',