diff --git a/Composer/cypress/integration/LGPage.spec.js b/Composer/cypress/integration/LGPage.spec.js
index 67f29b6bca..cf9d281e7b 100644
--- a/Composer/cypress/integration/LGPage.spec.js
+++ b/Composer/cypress/integration/LGPage.spec.js
@@ -24,7 +24,7 @@ context('check language generation page', () => {
     cy.get('@switchButton').click();
 
     // nav to Main dialog
-    cy.get('.dialogNavTree button[title="__TestTodoSample.Main"]').click();
+    cy.get('.dialogNavTree a[title="__TestTodoSample.Main"]').click();
     cy.wait(300);
 
     // dialog filter, edit mode button is disabled.
diff --git a/Composer/cypress/integration/Onboarding.spec.js b/Composer/cypress/integration/Onboarding.spec.js
index 9ef4fbe4a3..595cb0be40 100644
--- a/Composer/cypress/integration/Onboarding.spec.js
+++ b/Composer/cypress/integration/Onboarding.spec.js
@@ -18,6 +18,15 @@ context('onboarding', () => {
     cy.get('input[data-testid="NewDialogName"]').type('__TestOnboarding');
     cy.get('input[data-testid="NewDialogName"]').type('{enter}');
     cy.wait(2000);
+
+    //enable onboarding setting
+    cy.visitPage("Settings");
+    cy.wait(2000);
+    cy.get('[data-testid="ProjectTree"]').within(() => {
+      cy.get('[title="Onboarding"]').click();
+    });
+    cy.get('button[data-testid="onboardingToggle"]').click();
+    cy.visitPage("Design Flow");
   });
 
   it('walk through product tour teaching bubbles', () => {
diff --git a/Composer/cypress/support/commands.js b/Composer/cypress/support/commands.js
index 770d4dfc7d..a82d72318c 100644
--- a/Composer/cypress/support/commands.js
+++ b/Composer/cypress/support/commands.js
@@ -101,3 +101,7 @@ Cypress.Commands.add('addEventHandler', handler => {
   }
   cy.get(`[data-testid="triggerFormSubmit"]`).click();
 });
+
+Cypress.Commands.add('visitPage', (page) => {
+  cy.get(`[data-testid="LeftNav-CommandBarButton${page}"]`).click();
+});