diff --git a/chart/tests/cypress/mattermost-health.spec.js b/chart/tests/cypress/mattermost-health.spec.js
index fa16c6b1d17be677a91dfbeb3c2cb6b6e28e760f..d96ba219fb05bd66076974055e5c066e64468c2b 100644
--- a/chart/tests/cypress/mattermost-health.spec.js
+++ b/chart/tests/cypress/mattermost-health.spec.js
@@ -41,19 +41,19 @@ describe('Mattermost Healthcheck', function() {
         cy.title().should('include', 'Town Square - Big Bang')
       }
     })
+
+    cy.get("body").then($body => {
+      if ($body.find('button[class="SidebarNextSteps__close"]').length > 0) {
+        cy.get('button[class="SidebarNextSteps__close"]').click()
+        cy.get('button[type="submit"] > span').contains("Remove").click()
+      }
+    })
   })
 
   it('should allow chatting', function() {
-    // Click between channels to dodge the tutorial if it exists
-    cy.get('span[class="SidebarChannelLinkLabel"]').contains("Off-Topic").click()
-    cy.get('span[class="SidebarChannelLinkLabel"]').contains("Town Square").click()
     let randomChat = "Hello " + Math.random().toString(36).substring(8);
-    cy.get('textarea[id="post_textbox"]').type(randomChat)
-    cy.get('textarea[id="post_textbox"]').type('{enter}')
+    cy.get('textarea[id="post_textbox"]').type(randomChat).type('{enter}')
     cy.reload()
-    // Click between channels to dodge the tutorial if it exists
-    cy.get('span[class="SidebarChannelLinkLabel"]').contains("Off-Topic").click()
-    cy.get('span[class="SidebarChannelLinkLabel"]').contains("Town Square").click()
     cy.get('p').contains(randomChat).should('be.visible')
   })