diff --git a/fuel_test/cobbler/test_compact.py b/fuel_test/cobbler/test_compact.py
index 00a67450db..04f6d0e850 100644
--- a/fuel_test/cobbler/test_compact.py
+++ b/fuel_test/cobbler/test_compact.py
@@ -54,7 +54,11 @@ class CompactTestCase(CobblerTestCase):
             template=Template.compact(), ci=self.ci(), 
             controllers=self.nodes().controllers, 
             cinder=True,
-            cinder_nodes=lambda x: x.get_ip_address_by_network_name('internal'), ci.nodes().controllers + ci.nodes().computes+ ci.nodes().storages),
+            cinder_nodes=map(
+                lambda x: x.get_ip_address_by_network_name('internal'),
+                self.nodes().controllers
+                + self.nodes().computes
+                + self.nodes().storages),
             quantums=self.nodes().quantums, 
             quantum=False) 
         self.deploy_compact(quantum_node=False) 
diff --git a/fuel_test/manifest.py b/fuel_test/manifest.py
index 2becb1723f..46205acbb0 100644
--- a/fuel_test/manifest.py
+++ b/fuel_test/manifest.py
@@ -195,9 +195,9 @@ class Manifest(object):
             return ci.fixed_network()
 
     def write_openstack_simple_manifest(self, remote, ci, controllers,
-                                        use_syslog=True,
-                                        quantum=True,
-                                        cinder=True, cinder_nodes=['controller']):
+                                        use_syslog=True, quantum=True,
+                                        cinder=True, cinder_nodes=None):
+        if not cinder_nodes: cinder_nodes = ['controller']
         template = Template(
             root(
                 'deployment', 'puppet', 'openstack', 'examples',
@@ -255,11 +255,14 @@ class Manifest(object):
         self.write_manifest(remote, template)
 
 
-    def write_openstack_ha_minimal_manifest(self, remote, template, ci, controllers, quantums,
-                                 proxies=None, use_syslog=True,
-                                 quantum=True, loopback=True,
-                                 cinder=True, cinder_nodes=['controller'], quantum_netnode_on_cnt=True,
-                                 ha_provider='pacemaker'):
+    def write_openstack_ha_minimal_manifest(self, remote, template, ci,
+                                            controllers, quantums, proxies=None,
+                                            use_syslog=True, quantum=True,
+                                            loopback=True, cinder=True,
+                                            cinder_nodes=None,
+                                            quantum_netnode_on_cnt=True,
+                                            ha_provider='pacemaker'):
+        if not cinder_nodes: cinder_nodes = ['controller']
         template.replace(
             internal_virtual_ip=ci.internal_virtual_ip(),
             public_virtual_ip=ci.public_virtual_ip(),
@@ -294,12 +297,13 @@ class Manifest(object):
         self.write_manifest(remote, template)
 
 
-    def write_openstack_manifest(self, remote, template, ci, controllers, quantums,
-                                 proxies=None, use_syslog=True,
-                                 quantum=True, loopback=True,
-                                 cinder=True, cinder_nodes=['controller'],
-                                 swift=True, quantum_netnode_on_cnt=True,
+    def write_openstack_manifest(self, remote, template, ci, controllers,
+                                 quantums, proxies=None, use_syslog=True,
+                                 quantum=True, loopback=True, cinder=True,
+                                 cinder_nodes=None, swift=True,
+                                 quantum_netnode_on_cnt=True,
                                  ha_provider='pacemaker'):
+        if not cinder_nodes: cinder_nodes = ['controller']
         template.replace(
             internal_virtual_ip=ci.internal_virtual_ip(),
             public_virtual_ip=ci.public_virtual_ip(),