diff --git a/.zuul.yaml b/.zuul.yaml
index b73e31458..83f904d55 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -230,6 +230,8 @@
                 pipeline: package_content,vnfd,artifacts
               connect_grant:
                 base_url: http://127.0.0.1:9990/grant/v1/grants
+              openstack_vim:
+                stack_retries: 120
         tox_envlist: dsvm-functional-sol-separated-nfvo
 
 - project:
diff --git a/tacker/tests/functional/sol/vnflcm/base.py b/tacker/tests/functional/sol/vnflcm/base.py
index f6a68d563..0452de037 100644
--- a/tacker/tests/functional/sol/vnflcm/base.py
+++ b/tacker/tests/functional/sol/vnflcm/base.py
@@ -34,7 +34,7 @@ VNF_SUBSCRIPTION_TIMEOUT = 60
 VNF_INSTANTIATE_ERROR_WAIT = 80
 VNF_DELETE_COMPLETION_WAIT = 60
 VNF_HEAL_TIMEOUT = 600
-VNF_LCM_DONE_TIMEOUT = 600
+VNF_LCM_DONE_TIMEOUT = 1200
 RETRY_WAIT_TIME = 5
 FAKE_SERVER_MANAGER = FakeServerManager.get_instance()
 MOCK_NOTIFY_CALLBACK_URL = '/notification/callback'