diff --git a/cfn/F17/WordPress_Single_Instance_With_HA.template b/cfn/F17/invalid/WordPress_Single_Instance_With_HA.template
similarity index 100%
rename from cfn/F17/WordPress_Single_Instance_With_HA.template
rename to cfn/F17/invalid/WordPress_Single_Instance_With_HA.template
diff --git a/cfn/F17/WordPress_Single_Instance_With_HA_AccessPolicy.template b/cfn/F17/invalid/WordPress_Single_Instance_With_HA_AccessPolicy.template
similarity index 100%
rename from cfn/F17/WordPress_Single_Instance_With_HA_AccessPolicy.template
rename to cfn/F17/invalid/WordPress_Single_Instance_With_HA_AccessPolicy.template
diff --git a/cfn/F17/WordPress_Single_Instance_With_IHA.template b/cfn/F17/invalid/WordPress_Single_Instance_With_IHA.template
similarity index 100%
rename from cfn/F17/WordPress_Single_Instance_With_IHA.template
rename to cfn/F17/invalid/WordPress_Single_Instance_With_IHA.template
diff --git a/hot/mistral/templates/autoscaling_using_mistral.yaml b/hot/mistral/templates/autoscaling_using_mistral.yaml
index 5e617fb9..983bcf1f 100644
--- a/hot/mistral/templates/autoscaling_using_mistral.yaml
+++ b/hot/mistral/templates/autoscaling_using_mistral.yaml
@@ -16,6 +16,9 @@ parameters:
     default: cirros-0.3.4-x86_64-uec
     description: Name or ID of image
 
+  security_group_name:
+    type: string
+
   user:
     type: string
     default: cirros
@@ -50,7 +53,7 @@ resources:
         properties:
           image: { get_param: image }
           flavor: { get_param: flavor }
-          security_group: {get_resource: security_group}
+          security_group: {get_param: security_group_name}
           metadata: {"metering.stack": {get_param: "OS::stack_id"}}
       min_size: 1
       max_size: 2
diff --git a/hot/mistral/templates/server_with_ip.yaml b/hot/mistral/templates/server_with_ip.yaml
index 110b22d3..068c0a99 100644
--- a/hot/mistral/templates/server_with_ip.yaml
+++ b/hot/mistral/templates/server_with_ip.yaml
@@ -5,7 +5,7 @@ parameters:
     type: string
   flavor:
     type: string
-  security_group:
+  security_group_name:
     type: string
   metadata:
     type: json
@@ -18,7 +18,7 @@ resources:
       image: {get_param: image}
       metadata: {get_param: metadata}
       security_groups:
-        - get_param: security_group
+        - get_param: security_group_name
 
   floating_ip:
     type: OS::Nova::FloatingIP
diff --git a/hot/software-config/example-templates/example-chef-template.yaml b/hot/software-config/example-templates/example-chef-template.yaml
index c11db50a..cf326c23 100644
--- a/hot/software-config/example-templates/example-chef-template.yaml
+++ b/hot/software-config/example-templates/example-chef-template.yaml
@@ -26,7 +26,7 @@ resources:
         port_range_min: 22
         port_range_max: 22
 
-  config:
+  structured_config:
     type: OS::Heat::StructuredConfig
     properties:
       group: chef
diff --git a/openshift-origin/centos65/highly-available/oso_ha.yaml b/openshift-origin/centos65/highly-available/invalid/oso_ha.yaml
similarity index 100%
rename from openshift-origin/centos65/highly-available/oso_ha.yaml
rename to openshift-origin/centos65/highly-available/invalid/oso_ha.yaml
diff --git a/openshift-origin/centos65/highly-available/oso_ha_env.yaml b/openshift-origin/centos65/highly-available/invalid/oso_ha_env.yaml
similarity index 100%
rename from openshift-origin/centos65/highly-available/oso_ha_env.yaml
rename to openshift-origin/centos65/highly-available/invalid/oso_ha_env.yaml
diff --git a/openshift-origin/centos65/highly-available/oso_node.yaml b/openshift-origin/centos65/highly-available/invalid/oso_node.yaml
similarity index 100%
rename from openshift-origin/centos65/highly-available/oso_node.yaml
rename to openshift-origin/centos65/highly-available/invalid/oso_node.yaml
diff --git a/openshift-origin/centos65/highly-available/oso_node_env.yaml b/openshift-origin/centos65/highly-available/invalid/oso_node_env.yaml
similarity index 100%
rename from openshift-origin/centos65/highly-available/oso_node_env.yaml
rename to openshift-origin/centos65/highly-available/invalid/oso_node_env.yaml
diff --git a/test-requirements.txt b/test-requirements.txt
index 048b9a7b..fb052cdd 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,5 +12,5 @@ testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=0.9.34
 
-python-heatclient>=0.2.9
+python-heatclient>=1.0.0
 python-keystoneclient>=0.10.0
diff --git a/tools/validate-templates b/tools/validate-templates
index 3b58d1bd..a8580b08 100755
--- a/tools/validate-templates
+++ b/tools/validate-templates
@@ -29,7 +29,12 @@ def validate(base, name):
     basename, ext = os.path.splitext(name)
     if basename.endswith("_env"):
         return False
-    args = ["heat", "template-validate", "-f", os.path.join(base, name)]
+    args = ["heat",
+            "template-validate",
+            "-f",
+            os.path.join(base, name),
+            "--ignore-errors",
+            '99001']
     base_env = "%s_env%s" % (basename, ext)
     env = os.path.join(base, base_env)
     if os.path.exists(env):
@@ -37,12 +42,8 @@ def validate(base, name):
     try:
         subprocess.check_output(args, stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as e:
-        print "Got error validating %sputt%s , %s" % (base, name, e.output)
-        if re.search('ERROR: Service (\S+) does not have required endpoint in'
-                     ' service catalog for the resource type (\S+)', e.output):
-            return False
-        else:
-            return True
+        print "Got error validating %s/%s , %s" % (base, name, e.output)
+        return True
     else:
         return False