diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e8d16d..b7fab7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and [human-readable changelog](https://keepachangelog.com/en/1.0.0/).
 * S3 Support
 ### Fixed
 * Crontab entries are now created correctly (@dnmvisser)
+* Molecule now correctly runs lint (@mleutenegger)
 
 ## 0.1.5
 ### Changed
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index c80c5c6..062a695 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -3,8 +3,9 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
+lint: |
+    set -e
+    yamllint .
 platforms:
   - name: instance
     image: 'geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest'
@@ -23,5 +24,3 @@ scenario:
   name: default
 verifier:
   name: testinfra
-  lint:
-    name: flake8