diff --git a/tcp_tests/managers/runtestmanager.py b/tcp_tests/managers/runtestmanager.py
index 135a467..8fafe01 100644
--- a/tcp_tests/managers/runtestmanager.py
+++ b/tcp_tests/managers/runtestmanager.py
@@ -94,6 +94,8 @@
                         'enabled': True,
                         'cfg_dir': '${_param:runtest_tempest_cfg_dir}',
                         'cfg_name': '${_param:runtest_tempest_cfg_name}',
+                        'put_keystone_rc_enabled': True,
+                        'put_local_image_file_enabled': False,
                         'DEFAULT': {
                             'log_file': 'tempest.log'
                         },
@@ -172,7 +174,10 @@
 
     def prepare(self, dpdk=None):
         self.store_runtest_model()
-
+        cirros_pillar = ("salt-call --out=newline_values_only "
+                         "pillar.get "
+                         "glance:client:identity:"
+                         "admin_identity:image:cirros:location")
         salt_cmd = "salt -l info --hard-crash --state-output=mixed "
         salt_call_cmd = "salt-call -l info --hard-crash --state-output=mixed "
         commands = [
@@ -217,7 +222,7 @@
                 'cmd': ("set -ex;" +
                         salt_call_cmd + " state.sls nova.client")},
             {
-                'description': "Create cirros image for Tempest",
+                'description': "Upload images for Tempest",
                 'node_name': self.master_name,
                 'cmd': ("set -ex;" +
                         salt_call_cmd + " state.sls glance.client")},
@@ -226,6 +231,13 @@
                 'node_name': self.master_name,
                 'cmd': ("set -ex;" +
                         salt_call_cmd + " state.sls runtest")},
+            {
+                'description': "Upload cirros image",
+                'node_name': self.master_name,
+                'cmd': ("set -ex;"
+                        "cirros_url=$({}) && {} '{}' cmd.run "
+                        "\"wget $cirros_url -O /tmp/TestCirros-0.3.5.img\""
+                        .format(cirros_pillar, salt_cmd, self.target_name))},
         ]
 
         if dpdk: