diff --git a/.travis.yml b/.travis.yml
index 6dd0747e43..7150d0c7f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,9 @@ matrix:
     # The pypy tests are slow, so we list them first
     - python: pypy3.5
     - language: generic
-      env: USE_PYPY_NIGHTLY=1
+      env: PYPY_NIGHTLY_BRANCH=py3.5
+    - language: generic
+      env: PYPY_NIGHTLY_BRANCH=py3.6
     - python: 3.5.0
     - python: 3.5.2
     - python: 3.6
diff --git a/ci/travis.sh b/ci/travis.sh
index c856b9aba3..0b90aae129 100755
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -18,8 +18,8 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
     source testenv/bin/activate
 fi
 
-if [ "$USE_PYPY_NIGHTLY" = "1" ]; then
-    curl -fLo pypy.tar.bz2 http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux64.tar.bz2
+if [ "$PYPY_NIGHTLY_BRANCH" != "" ]; then
+    curl -fLo pypy.tar.bz2 http://buildbot.pypy.org/nightly/${PYPY_NIGHTLY_BRANCH}/pypy-c-jit-latest-linux64.tar.bz2
     if [ ! -s pypy.tar.bz2 ]; then
         # We know:
         # - curl succeeded (200 response code; -f means "exit with error if