diff --git a/.travis.yml b/.travis.yml
index 201d9d6..3da33e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,18 @@
-sudo: required
 language: python
 python:
-        - 2.7
-        - 3.4
         - 3.5
+        - 3.4
+        - 2.7
         - nightly
         - pypy
+        - pypy3
 services:
         - docker
 before_install:
-        - docker build -t internetarchive/rethinkdb tests
+        - sudo service docker restart ; sleep 10  # https://github.com/travis-ci/travis-ci/issues/4778
+        - docker run -d --publish=28015:28015 rethinkdb
+install:
+        - pip install . pytest
 script:
-        - 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"
+        - py.test -v -s tests
 
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 3e482f8..3a1ecdb 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -9,12 +9,12 @@ user=$(id -un)
 
 for python in python2.7 python3.4
 do
-	docker run --rm -i -t --volume="$script_dir/..:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- \
-		bash -x -c "adduser --gecos=$user --disabled-password --quiet --uid=$uid $user \
-			&& sudo -u $user bash -x -c 'cd /rethinkstuff \
-				&& virtualenv -p $python /tmp/venv \
-				&& source /tmp/venv/bin/activate \
-				&& pip install pytest . \
-				&& py.test -v -s tests'"
+	docker run -i --rm --volume="$script_dir/..:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- \
+		true < /dev/null
+		# bash -x -c "cd /rethinkstuff \
+		# 		&& virtualenv -p $python /tmp/venv \
+		# 		&& source /tmp/venv/bin/activate \
+		# 		&& pip install pytest . \
+		# 		&& py.test -v -s tests"
 done