diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b5ab612a630b5c971e89b95859682dbe67d363d..06b88528c34d240566fabd17ce009c1cc961ca67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,4 +18,12 @@ py3:
     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..f2b24c9790ae5889ee53077020dbb2aa37c9a141
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,7 @@
+extends: default
+
+rules:
+  document-start: disable
+  line-length: disable
+  indentation:
+    spaces: 2
diff --git a/MANIFEST.in b/MANIFEST.in
index 7a6c198fa39a262109b43e6da2899842077ea6a3..471ff7f033c814f5963b96863d1086ce87a6895e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,3 +9,4 @@ exclude cubicweb-compound.spec
 prune debian
 exclude .gitlab-ci.yml
 include README.rst
+exclude .yamllint
diff --git a/tox.ini b/tox.ini
index bc1ebd40fecfd434a32609454b25c6eb99ceca22..856e446c49d440f0a5fd0fc7c1714f9456ca1bca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py3, flake8, check-manifest
+envlist = py27, py3, flake8, check-manifest, yamllint
 
 [testenv]
 deps =
@@ -56,3 +56,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 .