diff --git a/roles/bootstrap-os/molecule/default/playbook.yml b/roles/bootstrap-os/molecule/default/converge.yml
similarity index 100%
rename from roles/bootstrap-os/molecule/default/playbook.yml
rename to roles/bootstrap-os/molecule/default/converge.yml
diff --git a/roles/bootstrap-os/molecule/default/molecule.yml b/roles/bootstrap-os/molecule/default/molecule.yml
index 75b6f0f0245ad649756bbe1a9fad26fb57cf8204..081d929e8828342414e620e0d085f99936092461 100644
--- a/roles/bootstrap-os/molecule/default/molecule.yml
+++ b/roles/bootstrap-os/molecule/default/molecule.yml
@@ -1,10 +1,9 @@
 ---
 dependency:
   name: galaxy
-lint:
-  name: yamllint
-  options:
-    config-file: ../../.yamllint
+lint: |
+  set -e
+  yamllint -c ../../.yamllint .
 driver:
   name: vagrant
   provider:
diff --git a/roles/container-engine/containerd/molecule/default/playbook.yml b/roles/container-engine/containerd/molecule/default/converge.yml
similarity index 100%
rename from roles/container-engine/containerd/molecule/default/playbook.yml
rename to roles/container-engine/containerd/molecule/default/converge.yml
diff --git a/roles/container-engine/containerd/molecule/default/molecule.yml b/roles/container-engine/containerd/molecule/default/molecule.yml
index a6bb80e9c552fd2b8c403b1b74be0837fc3aeb18..b49d73ce0da23d876884226bcef058c004854feb 100644
--- a/roles/container-engine/containerd/molecule/default/molecule.yml
+++ b/roles/container-engine/containerd/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ driver:
   name: vagrant
   provider:
     name: libvirt
-lint:
-  name: yamllint
-  options:
-    config-file: ../../../.yamllint
+lint: |
+  set -e
+  yamllint -c ../../../.yamllint .
 platforms:
   - name: ubuntu18
     box: generic/ubuntu1804
diff --git a/roles/container-engine/cri-o/molecule/default/playbook.yml b/roles/container-engine/cri-o/molecule/default/converge.yml
similarity index 100%
rename from roles/container-engine/cri-o/molecule/default/playbook.yml
rename to roles/container-engine/cri-o/molecule/default/converge.yml
diff --git a/roles/container-engine/cri-o/molecule/default/molecule.yml b/roles/container-engine/cri-o/molecule/default/molecule.yml
index 06517b625165247081acf34ca48f39a050c5bebb..e2132134d0ef40d294f09309f9e8d183a0a7a94f 100644
--- a/roles/container-engine/cri-o/molecule/default/molecule.yml
+++ b/roles/container-engine/cri-o/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ driver:
   name: vagrant
   provider:
     name: libvirt
-lint:
-  name: yamllint
-  options:
-    config-file: ../../../.yamllint
+lint: |
+  set -e
+  yamllint -c ../../../.yamllint .
 platforms:
   - name: ubuntu1804
     box: generic/ubuntu1804
diff --git a/roles/container-engine/docker/molecule/default/playbook.yml b/roles/container-engine/docker/molecule/default/converge.yml
similarity index 100%
rename from roles/container-engine/docker/molecule/default/playbook.yml
rename to roles/container-engine/docker/molecule/default/converge.yml
diff --git a/roles/container-engine/docker/molecule/default/molecule.yml b/roles/container-engine/docker/molecule/default/molecule.yml
index 689649e1a36bd8be277a3a51c9ca8e22903d55f6..eaf6fae500eb37e04ce1b4192ca8e6bdf0aa6d2e 100644
--- a/roles/container-engine/docker/molecule/default/molecule.yml
+++ b/roles/container-engine/docker/molecule/default/molecule.yml
@@ -3,10 +3,9 @@ driver:
   name: vagrant
   provider:
     name: libvirt
-lint:
-  name: yamllint
-  options:
-    config-file: ../../../.yamllint
+lint: |
+  set -e
+  yamllint -c ../../../.yamllint .
 platforms:
   - name: kubespray-docker
     box: generic/ubuntu1804
diff --git a/tests/requirements.txt b/tests/requirements.txt
index c9782264fd0e8122f81c4abdd5bd1ab686ab7569..6519907567d0e8aac8da41fc8a04c1b8474637d4 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -6,5 +6,7 @@ dopy==0.3.7
 cryptography==2.8
 ansible-lint==4.2.0
 openshift==0.8.8
-molecule==2.22
+molecule==3.0.6
+molecule-vagrant==0.3
+testinfra==5.2.2
 python-vagrant==0.5.15