diff --git a/fuelweb_test/settings.py b/fuelweb_test/settings.py
index 2e2a9e5ee..a5eb58218 100644
--- a/fuelweb_test/settings.py
+++ b/fuelweb_test/settings.py
@@ -437,6 +437,11 @@ UPGRADE_TEST_TEMPLATE = os.environ.get("UPGRADE_TEST_TEMPLATE")
 UPGRADE_CUSTOM_STEP_NAME = os.environ.get("UPGRADE_CUSTOM_STEP_NAME", "")
 TARBALL_PATH = os.environ.get('TARBALL_PATH')
 
+OCTANE_REPO_LOCATION = os.environ.get('OCTANE_REPO_LOCATION', '')
+if not OCTANE_REPO_LOCATION:
+    FUEL_PROPOSED_REPO_URL = os.environ.get('FUEL_PROPOSED_REPO_URL', '')
+    OCTANE_REPO_LOCATION = FUEL_PROPOSED_REPO_URL
+
 UPGRADE_FUEL_FROM = os.environ.get('UPGRADE_FUEL_FROM', '8.0')
 UPGRADE_FUEL_TO = os.environ.get('UPGRADE_FUEL_TO', '9.0')
 OCTANE_PATCHES = os.environ.get('OCTANE_PATCHES', None)
@@ -562,11 +567,6 @@ FUEL_PLUGIN_BUILDER_REPO = 'https://github.com/openstack/fuel-plugins.git'
 # URL to custom mirror with new OSCI packages which should be tested
 CUSTOM_PKGS_MIRROR = os.environ.get('CUSTOM_PKGS_MIRROR', '')
 
-# URL for Fuel proposed repository - required for correct ordering of upgrade:
-# update Fuel Master node using published packages (UPDATE_FUEL=True)
-# then attach the repository in the test case.
-FUEL_PROPOSED_REPO_URL = os.environ.get('FUEL_PROPOSED_REPO_URL', '')
-
 # Location of local mirrors on master node.
 LOCAL_MIRROR_UBUNTU = os.environ.get('LOCAL_MIRROR_UBUNTU',
                                      '/var/www/nailgun/ubuntu/x86_64')
diff --git a/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_base.py b/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_base.py
index a5f4a354f..799d7b365 100644
--- a/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_base.py
+++ b/fuelweb_test/tests/tests_upgrade/test_data_driven_upgrade_base.py
@@ -30,14 +30,14 @@ from proboscis.asserts import assert_true
 
 from fuelweb_test import logger
 from fuelweb_test.settings import DEPLOYMENT_MODE
-from fuelweb_test.settings import FUEL_PROPOSED_REPO_URL
-from fuelweb_test.settings import LOGS_DIR
 from fuelweb_test.settings import KEYSTONE_CREDS
+from fuelweb_test.settings import LOGS_DIR
+from fuelweb_test.settings import OCTANE_PATCHES
+from fuelweb_test.settings import OCTANE_REPO_LOCATION
 from fuelweb_test.settings import UPGRADE_FUEL_FROM
 from fuelweb_test.settings import UPGRADE_BACKUP_FILES_LOCAL_DIR
 from fuelweb_test.settings import UPGRADE_BACKUP_FILES_REMOTE_DIR
 from fuelweb_test.settings import UPGRADE_FUEL_TO
-from fuelweb_test.settings import OCTANE_PATCHES
 from fuelweb_test.tests.base_test_case import TestBasic
 
 
@@ -164,7 +164,7 @@ class DataDrivenUpgradeBase(TestBasic):
     def install_octane(self):
         """ Install fuel-octane package to master node"""
         conf_file = None
-        if FUEL_PROPOSED_REPO_URL:
+        if OCTANE_REPO_LOCATION:
             conf_file = '/etc/yum.repos.d/fuel-proposed.repo'
             cmd = ("echo -e "
                    "'[fuel-proposed]\n"
@@ -172,7 +172,7 @@ class DataDrivenUpgradeBase(TestBasic):
                    "baseurl={}/\n"
                    "gpgcheck=0\n"
                    "priority=1' > {}").format(
-                       FUEL_PROPOSED_REPO_URL,
+                       OCTANE_REPO_LOCATION,
                        conf_file)
 
             # pylint: disable=no-member
@@ -216,7 +216,7 @@ class DataDrivenUpgradeBase(TestBasic):
                     OCTANE_PATCHES))
             # pylint: enable=no-member
 
-        if FUEL_PROPOSED_REPO_URL:
+        if OCTANE_REPO_LOCATION:
             # pylint: disable=no-member
             self.admin_remote.rm_rf(conf_file)
             # pylint: enable=no-member