diff --git a/heat_tempest_plugin/tests/api/gabbits/resourcetypes.yaml b/heat_tempest_plugin/tests/api/gabbits/resourcetypes.yaml
index a259214..809feab 100644
--- a/heat_tempest_plugin/tests/api/gabbits/resourcetypes.yaml
+++ b/heat_tempest_plugin/tests/api/gabbits/resourcetypes.yaml
@@ -24,4 +24,4 @@
   status: 200
   response_json_paths:
     $.resources.TestResource.type: OS::Heat::TestResource
-    $.heat_template_version: '2016-10-14'
+    $.heat_template_version: /^20[1-9][0-9]-[0-1][0-9]-[0-3][0-9]$/
diff --git a/heat_tempest_plugin/tests/api/gabbits/templates.yaml b/heat_tempest_plugin/tests/api/gabbits/templates.yaml
index 0533f4a..ab0bbab 100644
--- a/heat_tempest_plugin/tests/api/gabbits/templates.yaml
+++ b/heat_tempest_plugin/tests/api/gabbits/templates.yaml
@@ -8,11 +8,11 @@
   GET: /template_versions
   status: 200
   response_json_paths:
-    $.template_versions[?(@.version='heat_template_version.2017-02-24')].type: hot
+    $.template_versions[?(@.version='heat_template_version.2016-04-08')].type: hot
 
 - name: list template functions
   desc: 721ff23c-8527-480f-a090-1c915b4f8430
-  GET: /template_versions/heat_template_version.2016-10-14/functions
+  GET: /template_versions/heat_template_version.2016-04-08/functions
   status: 200
   response_json_paths:
     $.template_functions[?(@.functions='get_file')].description: