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 68057f2..9fced2e 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
@@ -96,12 +96,11 @@
     type: OS::Heat::UpdateWaitConditionHandle
 
   wait_condition:
-    type: AWS::CloudFormation::WaitCondition
+    type: OS::Heat::WaitCondition
     depends_on: instance
     properties:
-      Count: 1
-      Handle: { get_resource: wait_handle }
-      Timeout: { get_param: timeout }
+      handle: { get_resource: wait_handle }
+      timeout: { get_param: timeout }
 
 
 outputs:
@@ -122,4 +121,4 @@
 
   testfile_data:
     description: Contents of /mnt/testfile from the mounted volume
-    value: { get_attr: ['wait_condition', 'Data'] }
+    value: { get_attr: ['wait_condition', 'data'] }
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 306ddcb..6d11026 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
@@ -106,12 +106,11 @@
     type: OS::Heat::UpdateWaitConditionHandle
 
   wait_condition:
-    type: AWS::CloudFormation::WaitCondition
+    type: OS::Heat::WaitCondition
     depends_on: instance
     properties:
-      Count: 1
-      Handle: { get_resource: wait_handle }
-      Timeout: { get_param: timeout }
+      handle: { get_resource: wait_handle }
+      timeout: { get_param: timeout }
 
 
 outputs: