diff --git a/.github/workflows/brand-plugin-test.yml b/.github/workflows/brand-plugin-test.yml
index 024e1e6e8..4d93a0a0c 100644
--- a/.github/workflows/brand-plugin-test.yml
+++ b/.github/workflows/brand-plugin-test.yml
@@ -29,6 +29,7 @@ jobs:
     needs: setup
     uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main
     with:
+      plugin-branch: 'release/3.9.0'
       module-repo: ${{ github.repository }}
       module-branch: ${{ needs.setup.outputs.branch }}
       plugin-repo: "bluehost/bluehost-wordpress-plugin"
@@ -39,6 +40,7 @@ jobs:
     needs: setup
     uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main
     with:
+      plugin-branch: 'release/2.7.0'
       module-repo: ${{ github.repository }}
       module-branch: ${{ needs.setup.outputs.branch }}
       plugin-repo: "newfold-labs/wp-plugin-hostgator"
diff --git a/tests/cypress/integration/wp-module-support/socialMedia.cy.js b/tests/cypress/integration/wp-module-support/socialMedia.cy.js
index 1121db1da..303415d1a 100644
--- a/tests/cypress/integration/wp-module-support/socialMedia.cy.js
+++ b/tests/cypress/integration/wp-module-support/socialMedia.cy.js
@@ -6,7 +6,7 @@ export const SocialMediaTextValidations = ( URL, ToolTipText, ModalHeaderText )
     const NextButton = '.navigation-buttons_next';
     const socialTest = '#facebook';
     if ( cy.get(socialTest).should( 'exist' ) ) {
-        cy.get(socialTest).clear();
+        cy.get(socialTest).clear({force: true});
         cy.wait(200);
         cy.get(socialTest).type( URL );
         cy.wait(200);
@@ -28,7 +28,7 @@ export const SocialMediaTextValidations = ( URL, ToolTipText, ModalHeaderText )
             cy.get( '.components-modal__content' ).should('be.visible');
             cy.get( '.components-modal__header-heading' ).should('have.text', ModalHeaderText);
         };
-        cy.get(':nth-child(2) > .components-button-group > .is-secondary').click();
+        cy.get('.components-button-group.nfd-onboarding-etw__buttons > .components-button.is-secondary').click();
         cy.wait(200);
         cy.get(NextButton).click();
         cy.wait(200);
@@ -36,7 +36,7 @@ export const SocialMediaTextValidations = ( URL, ToolTipText, ModalHeaderText )
         cy.wait(200);
         cy.get(NextButton).click();
         cy.wait(200);
-        cy.get(':nth-child(2) > .components-button-group > .is-primary').click();
+        cy.get('.components-button-group.nfd-onboarding-etw__buttons > .components-button.is-primary').click();
         cy.wait(200);
         cy.url().should('not.contain', 'wp-setup/step/basic-info');
         cy.wait(200);