diff --git a/.yamllint b/.yamllint
new file mode 100644
index 000000000..479488dee
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,12 @@
+extends: default
+
+rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  comments:
+    require-starting-space: false
+  truthy: disable
diff --git a/etc/kayobe/seed-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml
index 341b6da1c..978a98cc5 100644
--- a/etc/kayobe/seed-hypervisor.yml
+++ b/etc/kayobe/seed-hypervisor.yml
@@ -26,7 +26,8 @@
 # volume group for libvirt storage.
 #seed_hypervisor_lvm_groups:
 
-# Suggested list of seed hypervisor volume groups for libvirt. Not used by default.
+# Suggested list of seed hypervisor volume groups for libvirt. Not used by
+# default.
 #seed_hypervisor_lvm_groups_with_data:
 
 # Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format.
diff --git a/test-requirements.txt b/test-requirements.txt
index c4ae1e80b..23d7f8b3e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,3 +13,4 @@ oslotest>=1.10.0 # Apache-2.0
 # NOTE(mgoddard): This is required by tools/sphinx8.
 sphinx>=1.5.1 # BSD
 stestr # Apache-2.0
+yamllint # GPLv3
diff --git a/tox.ini b/tox.ini
index 27d8d86ed..450fac121 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,6 +32,7 @@ commands =
   # We use a thin wrapper around doc8 currently, which has support for sphinx
   # directives.
   {toxinidir}/tools/sphinx8 README.rst CONTRIBUTING.rst doc/source --ignore D001
+  yamllint etc/kayobe
 
 [testenv:venv]
 basepython = python3