diff --git a/.travis.yml b/.travis.yml
index 64732bce0932c1d628d3fdeffe4498e6109dedc7..b6502e54a81be24b4c391b7fb5dc4305bb6832a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,21 @@
 ---
 language: python
-python: "2.7"
+python: ["2.7", "3.4"]
 dist: trusty
 sudo: True
 group: beta
 services: [docker]
 env:
-    - platform: openbsd
-      driver: vagrant
-    - platform: xenial
-      driver: vagrant
-    - platform: trusty
-      driver: vagrant
-    - platform: jessie
+    - 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:
diff --git a/molecule.yml b/molecule.yml
index 7fd9b38e27a1e7f5bd95bad50f30a5cb9328716c..a33795ce158ff42ab470c0ba2a2e338b8a1bb07e 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -16,14 +16,18 @@ vagrant:
     options:
         cpus: 1
   platforms:
-  - name: openbsd
+  - name: openbsd60
     box: fnichol/openbsd-6.0-i386
-  - name: jessie
-    box: nogajun/jessie32
+  - name: openbsd59
+    box: fnichol/openbsd-5.9-i386
   - name: xenial
     box: ubuntu/xenial32
   - name: trusty
     box: ubuntu/trusty32
+  - name: jessie
+    box: debian/jessie32
+  - name: wheezy
+    box: debian/wheezy32
   instances:
   - name: collectd
     options:
@@ -70,3 +74,11 @@ docker:
     environment:
         DEBIAN_FRONTEND: noninteractive
         container: docker
+  - name: collectd-wheezy
+    image: debian
+    image_version: wheezy
+    command: /sbin/init
+    privileged: True
+    environment:
+        DEBIAN_FRONTEND: noninteractive
+        container: docker
diff --git a/tests/playbook.yml b/tests/playbook.yml
index 136a18255891cf79d341a35acf9e0fc90c1cfcb2..6f2f04b031354b5efcf74f9e668062269f531224 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: collectd-openbsd
+- hosts: collectd-openbsd*
   gather_facts: false
   roles: [openbsd-bootstrap]
 
diff --git a/tests/requirements.txt b/tests/requirements.txt
index f222e79fb237292bf6403d90bcf0a54a1709f450..1c8ea361c0af0ec637c22c71f1acdb9cd22295a0 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -2,7 +2,7 @@ ansible==2.2.0.0
 testinfra==1.5.1
 molecule==1.17.3
 ansible-lint==3.4.9
-pre-commit==0.9.4
+pre-commit==0.10.1
 piprot==0.9.7
 python-vagrant==0.5.14
 docker-py==1.10.6