diff --git a/cypress/tests/data/10-ApplicationSetup/20-CreateContext.cy.js b/cypress/tests/data/10-ApplicationSetup/20-CreateContext.cy.js
index 9468de85682..f5dbe599801 100644
--- a/cypress/tests/data/10-ApplicationSetup/20-CreateContext.cy.js
+++ b/cypress/tests/data/10-ApplicationSetup/20-CreateContext.cy.js
@@ -60,7 +60,7 @@ describe('Data suite tests', function() {
 		cy.login('admin', 'admin');
 		cy.get('a').contains('admin').click();
 		cy.get('a').contains('Dashboard').click();
-		cy.get('nav div[data-pc-section="header"] a span').contains('Administration').click();
+		cy.get('nav').contains('Administration').click();
 		cy.get('a').contains('Hosted Journals').click();
 		cy.get('a[class=show_extras]').click();
 		cy.contains('Settings wizard').click();
@@ -98,7 +98,9 @@ describe('Data suite tests', function() {
 		cy.login('admin', 'admin');
 		cy.get('a').contains('admin').click();
 		cy.get('a').contains('Dashboard').click();
-		cy.get('nav div[data-pc-section="header"] a span').contains('Settings').click();
+		cy.get('nav').contains('Settings').click();
+		// Ensure 'Journal' click despite submenu animation
+		cy.get('nav').contains('Journal').click({ force: true }); 
 		cy.get('nav div[data-pc-section="itemcontent"] a span').contains('Journal').click({ force: true });
 
 		cy.get('input[name="abbreviation-en"]').type('J Pub Know', {delay: 0});
@@ -124,8 +126,9 @@ describe('Data suite tests', function() {
 		cy.login('admin', 'admin');
 		cy.get('a').contains('admin').click();
 		cy.get('a').contains('Dashboard').click();
-		cy.get('nav div[data-pc-section="header"] a span').contains('Settings').click();
-		cy.get('nav div[data-pc-section="itemcontent"] a span').contains('Journal').click({ force: true });
+		cy.get('nav').contains('Settings').click();
+		// Ensure 'Journal' click despite submenu animation
+		cy.get('nav').contains('Journal').click({ force: true }); 
 		cy.get('button[id="contact-button"]').click();
 
 		// Submit the form with required fields missing.