diff --git a/tox.ini b/tox.ini
index 3493885747..0adc905016 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,3 +20,14 @@ commands =
   docstheme-build-translated.sh
 whitelist_externals =
   rm
+
+[testenv:lint]
+deps = yamllint
+commands =
+  bash -c "rm -rf {toxinidir}/.yamllint"
+  bash -c "mkdir -p {toxinidir}/.yamllint"
+  bash -c "cp -r $(ls {toxinidir}) {toxinidir}/.yamllint/"
+  bash -c "find {toxinidir}/.yamllint -type f -exec sed -i 's/%%%.*/XXX/g' \{\} +"
+  bash -c "yamllint -c {toxinidir}/yamllint.conf {toxinidir}/.yamllint/*/values*"
+whitelist_externals =
+  bash
diff --git a/yamllint.conf b/yamllint.conf
new file mode 100644
index 0000000000..ea59c739a1
--- /dev/null
+++ b/yamllint.conf
@@ -0,0 +1,49 @@
+---
+
+yaml-files:
+- '*.yaml'
+- '*.yml'
+- '.yamllint'
+
+rules:
+  braces:
+    level: warning
+  brackets:
+    level: warning
+  colons:
+    level: warning
+  commas:
+    level: warning
+  comments:
+    level: warning
+  comments-indentation:
+    level: warning
+  document-end:
+    level: warning
+  document-start:
+    level: warning
+  empty-lines:
+    level: warning
+  empty-values:
+    level: warning
+  hyphens:
+    level: warning
+  indentation:
+    spaces: 2
+    indent-sequences: whatever
+    level: warning
+  key-duplicates:
+    level: warning
+  key-ordering: disable
+  line-length: disable
+  new-line-at-end-of-file:
+    level: warning
+  new-lines:
+    level: warning
+  octal-values:
+    level: warning
+  quoted-strings: disable
+  trailing-spaces: enable
+  truthy:
+    level: warning
+...