diff --git a/.yamllint b/.yamllint
index 764780d44a9..45d8b7adcff 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,22 +1,19 @@
 extends: default
 
-# Disable all cosmetic rules
-# (see https://github.com/ansible/ansible/pull/15470#issuecomment-214437876)
-# Only keep 'key-duplicates' and 'new-lines: {type: unix}' checks enabled.
-
 rules:
-  braces: disable
-  brackets: disable
-  colons: disable
-  commas: disable
+  braces: {max-spaces-inside: 1, level: error}
+  brackets: {max-spaces-inside: 1, level: error}
+  colons: {max-spaces-after: -1, level: error}
+  commas: {max-spaces-after: -1, level: error}
   comments: disable
   comments-indentation: disable
   document-start: disable
-  empty-lines: disable
-  hyphens: disable
+  empty-lines: {max: 3, level: error}
+  hyphens: {level: error}
   indentation: disable
   key-duplicates: enable
   line-length: disable
   new-line-at-end-of-file: disable
   new-lines: {type: unix}
   trailing-spaces: disable
+  truthy: disable
diff --git a/test/utils/shippable/code-smell.sh b/test/utils/shippable/code-smell.sh
index dbcf81c7ba0..da66564bd67 100755
--- a/test/utils/shippable/code-smell.sh
+++ b/test/utils/shippable/code-smell.sh
@@ -15,7 +15,8 @@ if [ "${install_deps}" != "" ]; then
     pip list
 fi
 
-yamllint .
+yamllint ./test
+
 test/sanity/code-smell/replace-urlopen.sh
 test/sanity/code-smell/use-compat-six.sh
 test/sanity/code-smell/boilerplate.sh