diff --git a/dev/tests/functional/standalone_bootstrap.php b/dev/tests/functional/standalone_bootstrap.php
index 8dd490396..763062d04 100755
--- a/dev/tests/functional/standalone_bootstrap.php
+++ b/dev/tests/functional/standalone_bootstrap.php
@@ -28,9 +28,8 @@
     if (array_key_exists('MAGENTO_BP', $_ENV)) {
         // TODO REMOVE THIS CODE ONCE WE HAVE STOPPED SUPPORTING dev/tests/acceptance PATH
         // define TEST_PATH and TEST_MODULE_PATH
-        defined('TESTS_BP') || define('TESTS_BP', realpath(MAGENTO_BP . DIRECTORY_SEPARATOR . 'dev/tests/acceptance/'));
-
-        $RELATIVE_TESTS_MODULE_PATH = '/tests/functional/Magento/FunctionalTest';
+        defined('TESTS_BP') || define('TESTS_BP', dirname(dirname(__DIR__)));
+        $RELATIVE_TESTS_MODULE_PATH = '/tests/functional/tests/MFTF';
         defined('TESTS_MODULE_PATH') || define(
             'TESTS_MODULE_PATH',
             realpath(TESTS_BP . $RELATIVE_TESTS_MODULE_PATH)
diff --git a/src/Magento/FunctionalTestingFramework/_bootstrap.php b/src/Magento/FunctionalTestingFramework/_bootstrap.php
index 85e88fc09..34807d2b9 100644
--- a/src/Magento/FunctionalTestingFramework/_bootstrap.php
+++ b/src/Magento/FunctionalTestingFramework/_bootstrap.php
@@ -32,6 +32,10 @@
         defined($key) || define($key, $var);
     }
 
+    if (array_key_exists('MAGENTO_BP', $_ENV)) {
+        defined('TESTS_BP') || define('TESTS_BP', realpath(PROJECT_ROOT . DIRECTORY_SEPARATOR . 'dev/tests/acceptance'));
+    }
+
     defined('MAGENTO_CLI_COMMAND_PATH') || define(
         'MAGENTO_CLI_COMMAND_PATH',
         'dev/tests/acceptance/utils/command.php'