diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 233bc80d8f4b0a2ed98f97e33a6269dd6ef0d882..a1fa490069bae414848cd9cc6b5f2450d108d638 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@
     -   id: flake8
     -   id: check-symlinks
 -   repo: https://github.com/adarnimrod/ansible-pre-commit.git
-    sha: 0fadd691465b97db8992cfc66650f630e433324b
+    sha: v0.5.0
     hooks:
     -   id: ansible-syntax-check
         always_run: true
@@ -30,6 +30,6 @@
         name: piprot
         description: Check up-to-date Python requirements
         language: system
-        entry: piprot --quiet --outdated tests/requirements.txt
+        entry: piprot --outdated tests/requirements.txt
         files: requirements.txt
         always_run: true
diff --git a/.travis.yml b/.travis.yml
index 9ec9fc124a7fc110e081fa9bf4e1e37797de9094..cfabc88ee87cc304614189424dc558cc633afe8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,28 @@
 ---
 language: python
-python: ["2.7", "3.4"]
+python: ["2.7", "3.5"]
 dist: trusty
 sudo: True
 group: beta
-services: [docker]
 env:
     - platform: openbsd60
-      driver: vagrant
-    - &openbsd59 platform=openbsd59 driver=vagrant
-    - &openbsd56 platform=openbsd56 driver=vagrant
+    - &openbsd59 platform=openbsd59
+    - &openbsd56 platform=openbsd56
     - platform: xenial
-      driver: vagrant
     - platform: trusty
-      driver: vagrant
-    - &jessie platform=jessie driver=vagrant
-    - &wheezy platform=wheezy driver=vagrant
+    - &jessie platform=jessie
+    - &wheezy platform=wheezy
     - platform: precise
-      driver: vagrant
-    - driver: docker
-      platform: all
+    - &stretch platform=stretch
 matrix:
     fast_finish: True
     allow_failures:
-        - python: "3.4"
+        - python: "3.5"
         - env: *openbsd59
         - env: *openbsd56
         - env: *jessie
         - env: *wheezy
+        - env: *stretch
 cache:
   - pip
   - directories:
@@ -44,7 +39,7 @@ install:
 
 script:
   - pre-commit run --all-files
-  - molecule test --driver $driver --platform $platform
+  - molecule test --platform $platform
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/README.rst b/README.rst
index 72f51c3db9760eb7c0696bbc4ce8b6430088c2e3..c0913d3fea3fec39e623f4a16534811516f400a7 100644
--- a/README.rst
+++ b/README.rst
@@ -29,9 +29,8 @@ See :code:`tests/playbook.yml`.
 Testing
 -------
 
-Testing requires Python 2.7 and either Docker or Vagrant and Virtualbox.
-Install the Python dependencies, dependent roles and roles required for
-testing:
+Testing requires Python 2.7, Vagrant and Virtualbox. Install the Python
+dependencies, dependent roles and roles required for testing:
 
 .. code:: shell
 
diff --git a/molecule.yml b/molecule.yml
index b1668715282687959265344aa060e5696d3eeba0..510c35135a0e634b624ac4f057d7351b0fa9b829 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -26,12 +26,14 @@ vagrant:
     box: ubuntu/xenial32
   - name: trusty
     box: ubuntu/trusty32
-  - name: jessie
-    box: debian/jessie32
-  - name: wheezy
-    box: debian/wheezy32
   - name: precise
     box: hashicorp/precise32
+  - name: stretch
+    box: remram/debian-9-i386
+  - name: jessie
+    box: deb/jessie-i386
+  - name: wheezy
+    box: bmorg/debian-wheezy-i386
   instances:
   - name: python27
     options:
@@ -45,42 +47,3 @@ vagrant:
       vm.provider "virtualbox" do |v|
         v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"]
       end
-
-docker:
-  containers:
-  - name: python27-precise
-    image: ubuntu
-    image_version: precise
-    environment:
-        DEBIAN_FRONTEND: noninteractive
-        container: docker
-  - name: python27-trusty
-    image: ubuntu
-    image_version: trusty
-    environment:
-        DEBIAN_FRONTEND: noninteractive
-        container: docker
-  - name: python27-xenial
-    image: ubuntu
-    image_version: xenial
-    environment:
-        DEBIAN_FRONTEND: noninteractive
-        container: docker
-  - name: python27-wheezy
-    image: debian
-    image_version: wheezy
-    environment:
-        DEBIAN_FRONTEND: noninteractive
-        container: docker
-  - name: python27-jessie
-    image: debian
-    image_version: jessie
-    environment:
-        DEBIAN_FRONTEND: noninteractive
-        container: docker
-  - name: python27-stretch
-    image: debian
-    image_version: stretch
-    environment:
-        DEBIAN_FRONTEND: noninteractive
-        container: docker
diff --git a/tests/playbook.yml b/tests/playbook.yml
index af0ea5725a8a79182b3a87e8e80778237e4cb79b..327b16fdc2c03660d7aa4274ab7dcc9944468968 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -1,11 +1,21 @@
 ---
 - hosts: python27-openbsd*
-  gather_facts: False
-  roles: [openbsd-bootstrap]
+  gather_facts: false
+  roles:
+      - openbsd-bootstrap
+      - role: users
+        users: []
+        users_use_sudo: True
+        users_lock_root_ssh: False
 
-- hosts: python27-xenial
-  gather_facts: False
-  roles: [debian-bootstrap]
+- hosts: [pytho27-xenial, python27-wheezy, python27-precise]
+  gather_facts: false
+  roles:
+      - debian-bootstrap
+      - role: users
+        users: []
+        users_use_sudo: True
+        users_lock_root_ssh: False
 
 - hosts: all
   roles:
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 1c8ea361c0af0ec637c22c71f1acdb9cd22295a0..fc43b9a640a4f4c4c75292e61185d25556ae45e7 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,11 +1,10 @@
-ansible==2.2.0.0
-testinfra==1.5.1
-molecule==1.17.3
-ansible-lint==3.4.9
-pre-commit==0.10.1
+ansible==2.2.1.0
+testinfra==1.5.3
+molecule==1.19.1
+ansible-lint==3.4.10
+pre-commit==0.12.2
 piprot==0.9.7
 python-vagrant==0.5.14
-docker-py==1.10.6
-netaddr==0.7.18
+netaddr==0.7.19
 passlib==1.7.0
 bcrypt==3.1.2
diff --git a/tests/requirements.yml b/tests/requirements.yml
index 70716f60b9e624bc5a09442517a08667363949f4..fccce7574df98d466c55a309273c4060174e8cb0 100644
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -3,3 +3,5 @@
   name: openbsd-bootstrap
 - src: adarnimrod.debian-bootstrap
   name: debian-bootstrap
+- src: adarnimrod.users
+  name: users