diff --git a/.travis.yml b/.travis.yml
index 47c64a35..b37fddb9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,13 +10,16 @@ python:
 - "2.7"
 
 env:
-- MODE=mitogen MITOGEN_TEST_DISTRO=debian
-- MODE=mitogen MITOGEN_TEST_DISTRO=centos
-- MODE=debops_common ANSIBLE_VERSION=2.4.3.0
-- MODE=debops_common ANSIBLE_VERSION=2.5.1
-- MODE=ansible ANSIBLE_VERSION=2.4.3.0 MITOGEN_TEST_DISTRO=debian
-- MODE=ansible ANSIBLE_VERSION=2.5.1 MITOGEN_TEST_DISTRO=centos
-- MODE=ansible ANSIBLE_VERSION=2.5.1 MITOGEN_TEST_DISTRO=debian
+- MODE=mitogen DISTRO=debian
+- MODE=mitogen DISTRO=centos
+- MODE=debops_common VER=2.4.3.0
+- MODE=debops_common VER=2.5.1
+# Ansible tests.
+- MODE=ansible VER=2.4.3.0 DISTRO=debian
+- MODE=ansible VER=2.5.1 DISTRO=centos
+- MODE=ansible VER=2.5.1 DISTRO=debian
+# Sanity check our tests against vanilla Ansible, they should still pass.
+- MODE=ansible VER=2.5.1 DISTRO=debian STRATEGY=linear
 
 install:
 - pip install -r dev_requirements.txt
diff --git a/.travis/ansible_tests.sh b/.travis/ansible_tests.sh
index 26da7cfa..b5162ae0 100755
--- a/.travis/ansible_tests.sh
+++ b/.travis/ansible_tests.sh
@@ -3,8 +3,9 @@
 
 TRAVIS_BUILD_DIR="${TRAVIS_BUILD_DIR:-`pwd`}"
 TMPDIR="/tmp/ansible-tests-$$"
-ANSIBLE_VERSION="${ANSIBLE_VERSION:-2.4.3.0}"
-MITOGEN_TEST_DISTRO="${MITOGEN_TEST_DISTRO:-debian}"
+ANSIBLE_VERSION="${VER:-2.4.3.0}"
+export ANSIBLE_STRATEGY="${STRATEGY:-mitogen_linear}"
+DISTRO="${DISTRO:-debian}"
 
 export PYTHONPATH="${PYTHONPATH}:${TRAVIS_BUILD_DIR}"
 
@@ -30,7 +31,7 @@ docker run \
     --detach \
     --publish 0.0.0.0:2201:22/tcp \
     --name=target \
-    mitogen/${MITOGEN_TEST_DISTRO}-test
+    mitogen/${DISTRO}-test
 echo travis_fold:end:docker_setup
 
 
@@ -57,15 +58,8 @@ make -C ${TRAVIS_BUILD_DIR}/tests/ansible
 echo travis_fold:end:job_setup
 
 
-echo travis_fold:start:mitogen_linear
-/usr/bin/time ./mitogen_ansible_playbook.sh \
-    all.yml \
-    -i "${TMPDIR}/hosts"
-echo travis_fold:end:mitogen_linear
-
-
-echo travis_fold:start:vanilla_ansible
+echo travis_fold:start:ansible
 /usr/bin/time ./run_ansible_playbook.sh \
     all.yml \
     -i "${TMPDIR}/hosts"
-echo travis_fold:end:vanilla_ansible
+echo travis_fold:end:ansible
diff --git a/.travis/debops_common_tests.sh b/.travis/debops_common_tests.sh
index eff7c901..bdfeb146 100755
--- a/.travis/debops_common_tests.sh
+++ b/.travis/debops_common_tests.sh
@@ -4,8 +4,8 @@
 TMPDIR="/tmp/debops-$$"
 TRAVIS_BUILD_DIR="${TRAVIS_BUILD_DIR:-`pwd`}"
 TARGET_COUNT="${TARGET_COUNT:-2}"
-ANSIBLE_VERSION="${ANSIBLE_VERSION:-2.4.3.0}"
-MITOGEN_TEST_DISTRO=debian  # Naturally DebOps only supports Debian.
+ANSIBLE_VERSION="${VER:-2.4.3.0}"
+DISTRO=debian  # Naturally DebOps only supports Debian.
 
 export PYTHONPATH="${PYTHONPATH}:${TRAVIS_BUILD_DIR}"
 
@@ -60,7 +60,7 @@ do
         --detach \
         --publish 0.0.0.0:$port:22/tcp \
         --name=target$i \
-        mitogen/${MITOGEN_TEST_DISTRO}-test
+        mitogen/${DISTRO}-test
 
     echo \
         target$i \
diff --git a/.travis/mitogen_tests.sh b/.travis/mitogen_tests.sh
index a070602a..01e24963 100755
--- a/.travis/mitogen_tests.sh
+++ b/.travis/mitogen_tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -ex
 # Run the Mitogen tests.
 
-MITOGEN_TEST_DISTRO="${MITOGEN_TEST_DISTRO:-debian}"
+MITOGEN_TEST_DISTRO="${DISTRO:-debian}"
 MITOGEN_LOG_LEVEL=debug PYTHONPATH=. ${TRAVIS_BUILD_DIR}/run_tests