diff --git a/roles/build-test-packages/molecule/default/playbook.yml b/roles/build-test-packages/molecule/default/converge.yml
similarity index 100%
rename from roles/build-test-packages/molecule/default/playbook.yml
rename to roles/build-test-packages/molecule/default/converge.yml
diff --git a/roles/build-test-packages/molecule/default/molecule.yml b/roles/build-test-packages/molecule/default/molecule.yml
index 6392cc40a..213781eaa 100644
--- a/roles/build-test-packages/molecule/default/molecule.yml
+++ b/roles/build-test-packages/molecule/default/molecule.yml
@@ -2,8 +2,6 @@
 driver:
   name: docker
 log: true
-lint:
-  enabled: false
 platforms:
   - name: instance
     image: centos:7
@@ -14,8 +12,5 @@ provisioner:
     # ANSIBLE_STDOUT_CALLBACK: yaml
     # hack to make it find 'common' role from tq
     ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${MOLECULE_SCENARIO_DIRECTORY}/../../../../../tripleo-quickstart/roles"
-
 verifier:
   name: ansible
-  lint:
-    name: ansible-lint
diff --git a/roles/validate-perf/molecule/default/playbook.yml b/roles/validate-perf/molecule/default/converge.yml
similarity index 100%
rename from roles/validate-perf/molecule/default/playbook.yml
rename to roles/validate-perf/molecule/default/converge.yml
diff --git a/roles/validate-perf/molecule/default/molecule.yml b/roles/validate-perf/molecule/default/molecule.yml
index 6392cc40a..213781eaa 100644
--- a/roles/validate-perf/molecule/default/molecule.yml
+++ b/roles/validate-perf/molecule/default/molecule.yml
@@ -2,8 +2,6 @@
 driver:
   name: docker
 log: true
-lint:
-  enabled: false
 platforms:
   - name: instance
     image: centos:7
@@ -14,8 +12,5 @@ provisioner:
     # ANSIBLE_STDOUT_CALLBACK: yaml
     # hack to make it find 'common' role from tq
     ANSIBLE_ROLES_PATH: "${ANSIBLE_ROLES_PATH}:${MOLECULE_SCENARIO_DIRECTORY}/../../../../../tripleo-quickstart/roles"
-
 verifier:
   name: ansible
-  lint:
-    name: ansible-lint
diff --git a/tox.ini b/tox.ini
index d4ba9e622..abb96b32f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -63,6 +63,6 @@ deps =
     pytest-molecule<=1.2.3  # MIT
     selinux  # MIT
     mock
-    molecule>=3.0a4
+    molecule>=3.0a6
 commands =
     python -m pytest --color=yes --html={envlogdir}/reports.html --self-contained-html -rA --molecule-unavailable-driver=fail {tty:-s} {posargs:-k 'molecule and docker'}