diff --git a/heat_tempest_plugin/tests/scenario/templates/test_server_signal.yaml b/heat_tempest_plugin/tests/scenario/templates/test_server_signal.yaml
index a944053..90f1b47 100644
--- a/heat_tempest_plugin/tests/scenario/templates/test_server_signal.yaml
+++ b/heat_tempest_plugin/tests/scenario/templates/test_server_signal.yaml
@@ -104,6 +104,7 @@
 
   wait_condition:
     type: OS::Heat::WaitCondition
+    depends_on: server
     properties:
       handle: {get_resource: wait_handle}
       timeout: {get_param: timeout}
diff --git a/heat_tempest_plugin/tests/scenario/templates/test_volumes_create_from_backup.yaml b/heat_tempest_plugin/tests/scenario/templates/test_volumes_create_from_backup.yaml
index bc288f7..68057f2 100644
--- a/heat_tempest_plugin/tests/scenario/templates/test_volumes_create_from_backup.yaml
+++ b/heat_tempest_plugin/tests/scenario/templates/test_volumes_create_from_backup.yaml
@@ -97,6 +97,7 @@
 
   wait_condition:
     type: AWS::CloudFormation::WaitCondition
+    depends_on: instance
     properties:
       Count: 1
       Handle: { get_resource: wait_handle }
diff --git a/heat_tempest_plugin/tests/scenario/templates/test_volumes_delete_snapshot.yaml b/heat_tempest_plugin/tests/scenario/templates/test_volumes_delete_snapshot.yaml
index b383220..306ddcb 100644
--- a/heat_tempest_plugin/tests/scenario/templates/test_volumes_delete_snapshot.yaml
+++ b/heat_tempest_plugin/tests/scenario/templates/test_volumes_delete_snapshot.yaml
@@ -107,6 +107,7 @@
 
   wait_condition:
     type: AWS::CloudFormation::WaitCondition
+    depends_on: instance
     properties:
       Count: 1
       Handle: { get_resource: wait_handle }