diff --git a/tasks/openstack/scenario/cinder.yaml b/tasks/openstack/scenario/cinder.yaml
index fd8a953d..39605583 100644
--- a/tasks/openstack/scenario/cinder.yaml
+++ b/tasks/openstack/scenario/cinder.yaml
@@ -162,6 +162,7 @@
   CinderVolumes.create_nested_snapshots_and_attach_volume:
     -
       args:
+        {{ vm_params(image_name,flavor_name,none)}}
         nested_level: 1
         size:
           max: 1
@@ -170,9 +171,6 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 1
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=min(50, 2*controllers_amount),times=min(10, 3*controllers_amount), is_smoke=smoke) }}
diff --git a/tests/check_samples/test_certification_task.py b/tests/check_samples/test_certification_task.py
index df1daa19..272889ca 100644
--- a/tests/check_samples/test_certification_task.py
+++ b/tests/check_samples/test_certification_task.py
@@ -24,8 +24,6 @@ from tests.functional import utils
 
 class TestPreCreatedTasks(unittest.TestCase):
 
-    @unittest.skip("It started failing due to broken launching script. "
-                   "Requires investigation.")
     def test_task_samples_is_valid(self):
         rally = utils.Rally()
         full_path = os.path.join(