diff --git a/tests/e2e/cypress/integration/openconext/wayf/WayfShowsConnectedIdps.spec.js b/tests/e2e/cypress/integration/openconext/wayf/WayfShowsConnectedIdps.spec.js
index 0f6b4012b..abaa058c9 100644
--- a/tests/e2e/cypress/integration/openconext/wayf/WayfShowsConnectedIdps.spec.js
+++ b/tests/e2e/cypress/integration/openconext/wayf/WayfShowsConnectedIdps.spec.js
@@ -18,7 +18,7 @@ context('WayfMouseBehaviour', () => {
       // Ensure some elements are NOT on the page
       cy.notOnPage('Identity providers without access').should('not.exist');
       cy.notOnPage('Remember my choice');
-      cy.notOnPage('Return to service provider');
+      cy.notOnPage('Return to application');
 
   });
 
@@ -38,15 +38,15 @@ context('WayfMouseBehaviour', () => {
   it('Should show the return to service link when configured', () => {
       cy.visit('https://engine.vm.openconext.org/functional-testing/wayf?connectedIdps=5&backLink=true');
       cy.onPage('Select an organisation to log in to the application');
-      cy.onPage('Return to service provider');
+      cy.onPage('Return to application');
 
       // Ensure some elements are NOT on the page
       cy.notOnPage('Identity providers without access');
       cy.notOnPage('Remember my choice');
 
       // To be more precise, the links should be in the header and footer
-      cy.get('.mod-header .comp-links li:nth-child(1) a').should('have.text', 'Return to service provider');
-      cy.get('.footer-menu .comp-links li:nth-child(2) a').should('have.text', 'Return to service provider');
+      cy.get('.mod-header .comp-links li:nth-child(1) a').should('have.text', 'Return to application');
+      cy.get('.footer-menu .comp-links li:nth-child(2) a').should('have.text', 'Return to application');
   });
 
   it('Should show the remember my choice option', () => {
@@ -56,6 +56,6 @@ context('WayfMouseBehaviour', () => {
       cy.onPage('Remember my choice');
       // Ensure some elements are NOT on the page
       cy.notOnPage('Identity providers without access');
-      cy.notOnPage('Return to service provideraccess');
+      cy.notOnPage('Return to applicationaccess');
   });
 })
diff --git a/tests/e2e/cypress/integration/skeune/wayf/wayf.general.spec.js b/tests/e2e/cypress/integration/skeune/wayf/wayf.general.spec.js
index 04f598271..cde85e893 100644
--- a/tests/e2e/cypress/integration/skeune/wayf/wayf.general.spec.js
+++ b/tests/e2e/cypress/integration/skeune/wayf/wayf.general.spec.js
@@ -20,7 +20,7 @@ context('WAYF behaviour not tied to mouse / keyboard navigation', () => {
       cy.visit('https://engine.vm.openconext.org/functional-testing/wayf');
       cy.notOnPage('Identity providers without access').should('not.exist');
       cy.notOnPage('Remember my choice');
-      cy.notOnPage('Return to service provider');
+      cy.notOnPage('Return to application');
     });
 
     it('Should show ten connected IdPs', () => {
@@ -190,7 +190,7 @@ context('WAYF behaviour not tied to mouse / keyboard navigation', () => {
     it('Ensure some elements are NOT on the page', () => {
       cy.visit('https://engine.vm.openconext.org/functional-testing/wayf?connectedIdps=5&rememberChoiceFeature=true');
       cy.notOnPage('Identity providers without access');
-      cy.notOnPage('Return to service provideraccess');
+      cy.notOnPage('Return to applicationaccess');
     });
   });