diff --git a/.travis.yml b/.travis.yml
index de744f3..7bac95a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,36 @@
 language: python
 python:
-    - 3.5
-    - 3.4
-    - 2.7
-    - nightly
-    # - pypy
-    # - pypy3
+- 3.5
+- 3.4
+- 2.7
+- nightly
+- pypy
+- pypy3
+
+matrix:
+  allow_failures:
+  - python: pypy
+  - python: pypy3
 
 addons:
-    apt:
-        packages:
-            - python-gdbm
-            - python3-gdbm
-            - tor
+  apt:
+    packages:
+    - python-gdbm
+    - python3-gdbm
+    - tor
 
 services:
-    - docker
+- docker
 
 before_install:
-    - sudo service docker restart ; sleep 10  # https://github.com/travis-ci/travis-ci/issues/4778
-    - docker run -d --publish=28015:28015 rethinkdb
+- sudo service docker restart ; sleep 10  # https://github.com/travis-ci/travis-ci/issues/4778
+- docker run -d --publish=28015:28015 rethinkdb
 
 before_script:
-    - pip install . pytest requests
+- pip install . pytest requests
 
 script:
-    - py.test -v -s tests
-    - py.test -v -s --rethinkdb-servers=localhost tests tests
-    - py.test -v -s --rethinkdb-servers=localhost --rethinkdb-big-table tests
+- py.test -v -s tests
+- py.test -v -s --rethinkdb-servers=localhost tests tests
+- py.test -v -s --rethinkdb-servers=localhost --rethinkdb-big-table tests
 
diff --git a/setup.py b/setup.py
index 704c598..151684d 100755
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,7 @@ except:
 
 setuptools.setup(
         name='warcprox',
-        version='2.0.dev24',
+        version='2.0.dev25',
         description='WARC writing MITM HTTP/S proxy',
         url='https://github.com/internetarchive/warcprox',
         author='Noah Levitt',