diff --git a/.travis.yml b/.travis.yml
index 225db5e06039bbca9219f3eeb174b772811130ad..988ef0eb14b66b07b454302d6b5d141df9907171 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,16 +10,13 @@ env:
     matrix:
         - TOXENV=pre-commit
         - TOXENV=openbsd60
-        - TOXENV=xenial
         - TOXENV=trusty
         - TOXENV=precise
-        - &stretch TOXENV=stretch
         - &jessie TOXENV=jessie
         - TOXENV=wheezy
 matrix:
     fast_finish: True
     allow_failures:
-        - env: *stretch
         - env: *jessie
 cache:
   - pip
diff --git a/molecule.yml b/molecule.yml
index 12de0cd40c59d667d609c59b17cb64ec3cb56912..203d4af883219f5088c18fc66e69e25186e112aa 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -22,10 +22,14 @@ vagrant:
   platforms:
   - name: openbsd60
     box: fnichol/openbsd-6.0-i386
+  - name: xenial
+    box: ubuntu/xenial32
   - name: trusty
     box: ubuntu/trusty32
   - name: precise
     box: hashicorp/precise32
+  - name: stretch
+    box: remram/debian-9-i386
   - name: jessie
     box: deb/jessie-i386
   - name: wheezy
diff --git a/tox.ini b/tox.ini
index cd0873a5e0615e8dc74819f9051557d358d1d392..37440746fd830d4822b069e05ea6866dde1a765c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 skip_install = True
 skipsdist = True
-envlist = openbsd60,xenial,trusty,precise,stretch,jessie,wheezy
+envlist = openbsd60,trusty,precise,jessie,wheezy
 
 [testenv]
 envdir = {toxinidir}/.tox