diff --git a/.yamllint b/.yamllint
new file mode 100644
index 00000000..fb9002fa
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,10 @@
+---
+extends: default
+rules:
+  braces: {min-spaces-inside: 0, max-spaces-inside: 1}
+  brackets: {min-spaces-inside: 0, max-spaces-inside: 1}
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  indentation: disable
+  line-length: disable
diff --git a/hot/barbican/container_generic.yaml b/hot/barbican/container_generic.yaml
index 99085754..49b596af 100644
--- a/hot/barbican/container_generic.yaml
+++ b/hot/barbican/container_generic.yaml
@@ -34,4 +34,4 @@ outputs:
     value: { get_attr: [container, secret_refs] }
   consumers:
     description: The URIs to container consumers.
-    value: { get_attr: [container, consumers] }
\ No newline at end of file
+    value: { get_attr: [container, consumers] }
diff --git a/hot/barbican/order.yaml b/hot/barbican/order.yaml
index e42e1639..1e56b222 100644
--- a/hot/barbican/order.yaml
+++ b/hot/barbican/order.yaml
@@ -65,4 +65,4 @@ outputs:
     value: { get_attr: [order, order_ref] }
   secret_ref:
     description: The URI to the created secret.
-    value: { get_attr: [order, secret_ref] }
\ No newline at end of file
+    value: { get_attr: [order, secret_ref] }
diff --git a/hot/barbican/secret.yaml b/hot/barbican/secret.yaml
index 1c7632fa..aafdfad3 100644
--- a/hot/barbican/secret.yaml
+++ b/hot/barbican/secret.yaml
@@ -69,9 +69,9 @@ outputs:
   secret_status:
     description: The status of the secret.
     value: { get_attr: [secret, status] }
-  secret_status:
+  secret_payload:
     description: The decrypted secret payload.
     value: { get_attr: [secret, status] }
   secret_ref:
     description: Reference for created secret.
-    value: { get_resource: secret }
\ No newline at end of file
+    value: { get_resource: secret }
diff --git a/hot/lbaasv2/lb_group.yaml b/hot/lbaasv2/lb_group.yaml
index 76e6b715..f822c207 100644
--- a/hot/lbaasv2/lb_group.yaml
+++ b/hot/lbaasv2/lb_group.yaml
@@ -156,7 +156,6 @@ resources:
 outputs:
 
   lburl:
-    description: URL of the loadbalancer
     value:
       str_replace:
         template: http://IP_ADDRESS:PORT
diff --git a/hot/senlin/cluster.yaml b/hot/senlin/cluster.yaml
index 5b28e7e8..3282cc92 100644
--- a/hot/senlin/cluster.yaml
+++ b/hot/senlin/cluster.yaml
@@ -25,7 +25,7 @@ resources:
   profile:
     type: OS::Senlin::Profile
     properties:
-      type:  os.nova.server-1.0
+      type: os.nova.server-1.0
       properties:
         flavor: {get_param: flavor}
         image: {get_param: image}
@@ -93,4 +93,3 @@ outputs:
         template: curl -X POST LINK
         params:
           LINK: {get_attr: [receiver_scale_in, channel, alarm_url]}
-
diff --git a/test-requirements.txt b/test-requirements.txt
index 1630ea44..4ef137f5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,6 +11,7 @@ salt
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=0.9.34
+yamllint>=1.2.0
 
 python-heatclient>=1.2.0
 python-keystoneclient>=0.10.0
diff --git a/tox.ini b/tox.ini
index 1dffeda3..7a194aed 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,7 @@ commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
 
 [testenv:pep8]
 commands = flake8
+           yamllint .
 
 [testenv:venv]
 commands = {posargs}