diff --git a/utils/lint_check.sh b/utils/lint_check.sh
index 4970026687d693953fda6e7937d711cf93b0f0b7..eba2c1d53ba42ee8f6d8c5371fe01316945fe6b5 100755
--- a/utils/lint_check.sh
+++ b/utils/lint_check.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-topdir=`dirname $(dirname $0)`
+topdir="`dirname $(dirname $0)`"
 
 flake8 .
 pydocstyle .
@@ -11,15 +11,18 @@ ANSIBLE_MODULE_UTILS=${ANSIBLE_MODULE_UTILS:-"${topdir}/plugins/module_utils"}
 export ANSIBLE_LIBRARY ANSIBLE_MODULE_UTILS
 
 yaml_dirs=(
-    "${topdir}/tests/*.yml"
-    "${topdir}/tests/*/*.yml"
-    "${topdir}/tests/*/*/*.yml"
-    "${topdir}/playbooks/*.yml"
-    "${topdir}/playbooks/*/*.yml"
-    "${topdir}/molecule/*/*.yml"
-    "${topdir}/molecule/*/*/*.yml"
+    "${topdir}/tests"
+    "${topdir}/playbooks"
+    "${topdir}/molecule"
 )
 
-ansible-lint --force-color ${yaml_dirs[@]}
+for dir in "${yaml_dirs[@]}"
+do
+    find "${dir}" -type f -name "*.yml" | xargs ansible-lint --force-color
+done
 
-yamllint -f colored ${yaml_dirs[@]}
+
+for dir in "${yaml_dirs[@]}"
+do
+    find "${dir}" -type f -name "*.yml" | xargs yamllint 
+done