diff --git a/.travis.yml b/.travis.yml
index 1f14625..201d9d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,15 @@
 sudo: required
 language: python
 python:
-  - 3.4
-  - 3.5
-  - 2.7
+        - 2.7
+        - 3.4
+        - 3.5
+        - nightly
+        - pypy
 services:
-  - docker
+        - docker
+before_install:
+        - docker build -t internetarchive/rethinkdb tests
 script:
-  - ./tests/run-tests.sh
+        - docker run --rm -i -t --volume="..:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- bash -x -c "cd /rethinkstuff && virtualenv -p $python /tmp/venv && source /tmp/venv/bin/activate && pip install pytest .  && py.test -v -s tests"
+