diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff4608357b536eab999dd9401fe607e0772f562b..cee05d6f5b7a0b2b36f86cf05836f7595a1de527 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,3 +21,12 @@ py27:
     paths:
       - py3-deprecated-warnings.json
 
+yamllint:
+  rules:
+    - changes:
+        - "**/*.yaml"
+        - "*.yaml"
+        - "**/*.yml"
+        - "*.yml"
+  script:
+    - tox -e yamllint
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000000000000000000000000000000000000..38c68bafa9933e8bbc5311c34e19fd21279054fa
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,5 @@
+extends: default
+
+rules:
+  document-start: disable
+  line-length: disable
diff --git a/MANIFEST.in b/MANIFEST.in
index 377651cf9ecedb5e8e2a896a5862cb19b0690bad..315e2c3785a77775f495dc608a228806d99d6336 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -10,3 +10,4 @@ include test/data/bootstrap_cubes
 exclude .gitlab-ci.yml
 exclude cubicweb-addressbook.spec
 prune debian
+exclude .yamllint
diff --git a/tox.ini b/tox.ini
index a0c3e421e9d752de4eb70f25015e35d78bb491aa..bfe0b6b49f4866fa87cf816e9f4bc2e8c27b8c7e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py3, flake8
+envlist = py27, py3, flake8, yamllint
 
 [testenv]
 deps =
@@ -64,3 +64,9 @@ commands =
   sh -c "PACKAGE_NAME=$(python3 setup.py --name) && VERSION=$(python3 setup.py --version) &&   cd dist &&   tar xf $PACKAGE_NAME-$VERSION.tar.gz &&   cd $PACKAGE_NAME-$VERSION &&   cp -a {toxinidir}/debian . &&   mk-origtargz --rename ../$PACKAGE_NAME-$VERSION.tar.gz &&   dpkg-buildpackage -us -uc --no-check-builddeps --build=source "
   sh -c "cd dist && dcmd zip latest.zip *.changes"
   http -f POST https://{env:JENKINS_USER}:{env:JENKINS_TOKEN}@jenkins.intra.logilab.fr/job/pkg-from-dsc/buildWithParameters DIST=buster source.zip@dist/latest.zip REPO=buster PUBLISH=true
+
+[testenv:yamllint]
+skip_install = true
+deps = yamllint
+commands =
+  yamllint .