diff --git a/ansible.cfg b/ansible.cfg
index 905e3c64897217cd1b88acde10920ae04c7c6011..a33a906b7db5fa209df2b129eff0b36c42f661d9 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -2,7 +2,7 @@
 library = library
 host_key_checking = False
 retry_files_enabled = False
-roles_path = .molecule/roles:.molecule/../roles:../:../../
+roles_path = ../:.molecule/roles:.molecule/../roles:../../
 command_warnings = True
 deprecation_warnings = True
 callback_whitelist = profile_tasks
diff --git a/tests/playbook.yml b/tests/playbook.yml
index fd7c965646a82ecb0fed57bd20d86ea338a99a1d..42239726b204f08dfed1cf906847be4c90be2987 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -1,7 +1,7 @@
 ---
 - hosts: apache-xenial
   gather_facts: false
-  roles: [adarnimrod.debian-bootstrap]
+  roles: [debian-bootstrap]
 
 - hosts: all
   strategy: free
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 70cb7661036d9bd7cc73bfb2f4f8978edce7ea4c..2e455727c40eeac3b9f47877c6804f18f894852d 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,8 +1,11 @@
 ansible==2.2.0.0
 testinfra==1.4.5
-molecule==1.16.1
-ansible-lint==3.4.8
+molecule==1.17.0
+ansible-lint==3.4.9
 pre-commit==0.9.4
 piprot==0.9.7
 python-vagrant==0.5.14
 docker-py==1.10.6
+netaddr==0.7.18
+passlib==1.7.0
+bcrypt==3.1.2
diff --git a/tests/requirements.yml b/tests/requirements.yml
index cdc294cd67e8c5b70eed5178580e6edde25e10bb..70716f60b9e624bc5a09442517a08667363949f4 100644
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -1,3 +1,5 @@
 ---
 - src: adarnimrod.openbsd-bootstrap
+  name: openbsd-bootstrap
 - src: adarnimrod.debian-bootstrap
+  name: debian-bootstrap