diff --git a/.travis.yml b/.travis.yml
index abc583a44f62a169059b177cabed55bfe3ab9183..b6502e54a81be24b4c391b7fb5dc4305bb6832a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,38 @@
 ---
 language: python
-python: "2.7"
+python: ["2.7", "3.4"]
 dist: trusty
-sudo: false
+sudo: True
 group: beta
 services: [docker]
+env:
+    - platform: openbsd60
+      driver: vagrant
+    - &openbsd59 platform=openbsd59 driver=vagrant
+    - driver: docker
+      platform: all
+matrix:
+    fast_finish: True
+    allow_failures:
+        - python: "3.4"
+        - env: *openbsd59
 cache:
   - pip
   - directories:
       - $HOME/.pre-commit
 
 install:
+  - sudo apt-get update
+  - sudo apt-get install -y linux-headers-$(uname -r) virtualbox
+  - wget https://releases.hashicorp.com/vagrant/1.9.1/vagrant_1.9.1_x86_64.deb
+  - sudo dpkg -i vagrant_1.9.1_x86_64.deb
   - pip install -r tests/requirements.txt | cat
   - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
   - molecule dependency
 
 script:
   - pre-commit run --all-files
-  - molecule test --driver docker
+  - molecule test --driver $driver --platform $platform
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
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/molecule.yml b/molecule.yml
index 047252562f1c5b7e1c52d5f5ededea82ded60043..7c404782930cbf4a23544b62f0a02c2cd6e2a5a2 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -13,20 +13,34 @@ vagrant:
   providers:
   - name: virtualbox
     type: virtualbox
+    options:
+        cpus: 1
   platforms:
-  - name: openbsd
-    box: kaorimatz/openbsd-6.0-amd64
+  - name: openbsd60
+    box: fnichol/openbsd-6.0-i386
+  - name: openbsd59
+    box: fnichol/openbsd-5.9-i386
+  - name: xenial
+    box: ubuntu/xenial32
+  - name: trusty
+    box: ubuntu/trusty32
   - name: jessie
-    box: debian/jessie64
+    box: debian/jessie32
+  - name: wheezy
+    box: debian/wheezy32
   instances:
   - name: deploy-key
     options:
         append_platform_to_hostname: yes
   raw_config_args:
   - 'vm.synced_folder ".", "/vagrant", disabled: true'
-  - 'vbguest.auto_update = false'
-  - 'landrush.enabled = false'
-  - 'landrush_ip.override = false'
+  - 'vbguest.auto_update = false if Vagrant.has_plugin?("vbguest")'
+  - 'landrush.enabled = false if Vagrant.has_plugin?("landrush")'
+  - 'landrush_ip.override = false if Vagrant.has_plugin?("landrush")'
+  - |
+      vm.provider "virtualbox" do |v|
+        v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
+      end
 
 docker:
   containers:
@@ -58,3 +72,9 @@ docker:
     environment:
         DEBIAN_FRONTEND: noninteractive
         container: docker
+  - name: deploy-key-wheezy
+    image: debian
+    image_version: wheezy
+    environment:
+        DEBIAN_FRONTEND: noninteractive
+        container: docker
diff --git a/tasks/main.yml b/tasks/main.yml
index 87bf4d2b6c0569efbda338b063b335a0ff38c8cf..b87e65d4d6480501b5bf4c4978592fb4f86d2a55 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,6 @@
 ---
 # tasks file for deploy-key
+
 - name: Assertions
   assert:
     that:
diff --git a/tests/playbook.yml b/tests/playbook.yml
index 7960465cbcbc701731927be7cebf906878a5d207..e5693aaaccdb2e59d72cd3829321db43e155b01e 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -1,14 +1,14 @@
 ---
-- hosts: deploy-key-openbsd
+- hosts: deploy-key-openbsd*
   gather_facts: false
-  roles: [adarnimrod.openbsd-bootstrap]
+  roles: [openbsd-bootstrap]
 
 - hosts: deploy-key-xenial
   gather_facts: false
-  roles: [adarnimrod.debian-bootstrap]
+  roles: [debian-bootstrap]
 
 - hosts: all
-  tasks:
+  pre_tasks:
       - name: Create SSH keypair
         local_action: command ssh-keygen -t rsa -N '' -f files/id_rsa
         run_once: True
@@ -27,9 +27,6 @@
         service:
             name: ssh
             state: started
-
-- hosts: all
-  strategy: free
   roles:
     - role: deploy-key
       deploy_key: '{{ lookup("file", "id_rsa") }}'
diff --git a/tests/requirements.txt b/tests/requirements.txt
index b9dd3357849815f2a92024577fb91a51616cb9da..55604bc4287034e97c95ba71fdebe4462173b9c0 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.7
-pre-commit==0.9.4
+ansible==2.2.1.0
+testinfra==1.5.2
+molecule==1.17.3
+ansible-lint==3.4.10
+pre-commit==0.10.1
 piprot==0.9.7
 python-vagrant==0.5.14
 docker-py==1.10.6
+netaddr==0.7.19
+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