diff --git a/fuel_ccp_tests/fixtures/os_fixtures.py b/fuel_ccp_tests/fixtures/os_fixtures.py
index bb7cb9f..a6f9537 100644
--- a/fuel_ccp_tests/fixtures/os_fixtures.py
+++ b/fuel_ccp_tests/fixtures/os_fixtures.py
@@ -64,7 +64,7 @@ def galera_deployed(ccpcluster,
     # Note: keep fixtures in strict dependences from each other!
     if not config.os.running:
         general_config = deepcopy(settings.CCP_CONF)
-        if settings.BUILD_IMAGES:
+        if settings.REGISTRY == "127.0.0.1:31500":
             k8s_actions.create_registry()
             ccpcluster.build()
         topology_path = \
diff --git a/fuel_ccp_tests/managers/osmanager.py b/fuel_ccp_tests/managers/osmanager.py
index 9e7e5b9..c8c0c6d 100644
--- a/fuel_ccp_tests/managers/osmanager.py
+++ b/fuel_ccp_tests/managers/osmanager.py
@@ -50,7 +50,7 @@ class OSManager(object):
         Deploy openstack with stacklight topology
         """
         LOG.info("Preparing openstack log collector fixture...")
-        if settings.BUILD_IMAGES:
+        if settings.REGISTRY == "127.0.0.1:31500":
             LOG.info("Creating registry...")
             self.__k8s_actions.create_registry()
             LOG.info("Building images...")
diff --git a/fuel_ccp_tests/tests/system/test_deploy.py b/fuel_ccp_tests/tests/system/test_deploy.py
index a798d94..90e5b45 100644
--- a/fuel_ccp_tests/tests/system/test_deploy.py
+++ b/fuel_ccp_tests/tests/system/test_deploy.py
@@ -46,14 +46,10 @@ class TestDeployOpenstack(base_test.SystemBaseTest):
 
         Duration 35 min
         """
-        if settings.BUILD_IMAGES:
+        if settings.REGISTRY == "127.0.0.1:31500":
             k8s_actions.create_registry()
             ccpcluster.build()
-        else:
-            if not settings.REGISTRY:
-                raise ValueError("The REGISTRY variable should be set with "
-                                 "external registry address, "
-                                 "current value {0}".format(settings.REGISTRY))
+
         ccpcluster.deploy()
         post_os_deploy_checks.check_jobs_status(k8s_actions.api)
         post_os_deploy_checks.check_pods_status(k8s_actions.api)
@@ -82,14 +78,10 @@ class TestDeployOpenstack(base_test.SystemBaseTest):
         Duration 35 min
         """
         remote = underlay.remote(host=config.k8s.kube_host)
-        if settings.BUILD_IMAGES:
+        if settings.REGISTRY == "127.0.0.1:31500":
             k8s_actions.create_registry()
             ccpcluster.build()
-        else:
-            if not settings.REGISTRY:
-                raise ValueError("The REGISTRY variable should be set with "
-                                 "external registry address, "
-                                 "current value {0}".format(settings.REGISTRY))
+
         ccpcluster.deploy()
         post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=4500)
         post_os_deploy_checks.check_pods_status(k8s_actions.api, timeout=4500)
diff --git a/fuel_ccp_tests/tests/system/test_few_os.py b/fuel_ccp_tests/tests/system/test_few_os.py
index 5e82867..f3274c2 100644
--- a/fuel_ccp_tests/tests/system/test_few_os.py
+++ b/fuel_ccp_tests/tests/system/test_few_os.py
@@ -45,7 +45,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
 
         Duration 90 min
         """
-        if not settings.REGISTRY:
+        if settings.REGISTRY == "127.0.0.1:31500":
             k8s_actions.create_registry()
             ccpcluster.build()
         topology_path = \
@@ -113,7 +113,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
 
         Duration 90 min
         """
-        if not settings.REGISTRY:
+        if settings.REGISTRY == "127.0.0.1:31500":
             k8s_actions.create_registry()
             ccpcluster.build()
         topology_path = \
@@ -182,7 +182,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
 
         Duration 60 min
         """
-        if not settings.REGISTRY:
+        if settings.REGISTRY == "127.0.0.1:31500":
             k8s_actions.create_registry()
             ccpcluster.build()
         topology_path = \