diff --git a/actions-services.yml b/actions-services.yml
index 85f6bae3..32bfe9d2 100644
--- a/actions-services.yml
+++ b/actions-services.yml
@@ -11,7 +11,6 @@ services:
       - test-browser
     environment:
       - PROFILE_URL_FOR_TESTS=http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub
-      - MFA_SETUP_URL_FOR_TESTS=http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub
       - ADMIN_EMAIL=john_doe@there.com
       - ADMIN_PASS=b
       - SECRET_SALT=abc123
@@ -96,7 +95,6 @@ services:
       ID_BROKER_BASE_URI: "dummy"
       ID_BROKER_TRUSTED_IP_RANGES: "192.168.0.1/8"
       MFA_SETUP_URL: "http://pwmanager.local:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port"
-      MFA_SETUP_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub"
       REMEMBER_ME_SECRET: "12345"
       PROFILE_URL: "http://pwmanager:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port"
       PROFILE_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub"
diff --git a/development/idp-local/metadata/saml20-idp-hosted.php b/development/idp-local/metadata/saml20-idp-hosted.php
index 892df6cd..e9b6b14a 100644
--- a/development/idp-local/metadata/saml20-idp-hosted.php
+++ b/development/idp-local/metadata/saml20-idp-hosted.php
@@ -67,5 +67,5 @@
 // Copy configuration for port 80 and modify host and profileUrl.
 $metadata['http://ssp-idp1.local'] = $metadata['http://ssp-idp1.local:8085'];
 $metadata['http://ssp-idp1.local']['host'] = 'ssp-idp1.local';
-$metadata['http://ssp-idp1.local']['authproc'][10]['mfaSetupUrl'] = Env::get('MFA_SETUP_URL_FOR_TESTS');
+$metadata['http://ssp-idp1.local']['authproc'][10]['mfaSetupUrl'] = Env::get('PROFILE_URL_FOR_TESTS');
 $metadata['http://ssp-idp1.local']['authproc'][30]['profileUrl'] = Env::get('PROFILE_URL_FOR_TESTS');
diff --git a/docker-compose.yml b/docker-compose.yml
index 32727eee..178786d3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,7 +45,6 @@ services:
     environment:
       - COMPOSER_CACHE_DIR=/composer
       - PROFILE_URL_FOR_TESTS=http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub
-      - MFA_SETUP_URL_FOR_TESTS=http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub
       - ADMIN_EMAIL=john_doe@there.com
       - ADMIN_PASS=b
       - SECRET_SALT=abc123
@@ -173,7 +172,6 @@ services:
       ID_BROKER_BASE_URI: "dummy"
       ID_BROKER_TRUSTED_IP_RANGES: "192.168.0.1/8"
       MFA_SETUP_URL: "http://pwmanager.local:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port"
-      MFA_SETUP_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub"
       REMEMBER_ME_SECRET: "12345"
       PROFILE_URL: "http://pwmanager:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port"
       PROFILE_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub"
diff --git a/features/bootstrap/MfaContext.php b/features/bootstrap/MfaContext.php
index b2a80652..ced88bce 100644
--- a/features/bootstrap/MfaContext.php
+++ b/features/bootstrap/MfaContext.php
@@ -394,8 +394,8 @@ public function iClickTheSetUpMfaButton()
      */
     public function iShouldEndUpAtTheMfaSetupUrl()
     {
-        $mfaSetupUrl = Env::get('MFA_SETUP_URL_FOR_TESTS');
-        Assert::assertNotEmpty($mfaSetupUrl, 'No MFA_SETUP_URL_FOR_TESTS provided');
+        $mfaSetupUrl = Env::get('PROFILE_URL_FOR_TESTS');
+        Assert::assertNotEmpty($mfaSetupUrl, 'No PROFILE_URL_FOR_TESTS provided');
         $currentUrl = $this->session->getCurrentUrl();
         Assert::assertStringStartsWith(
             $mfaSetupUrl,