diff --git a/scripts/build-docs b/scripts/build-docs
index b434798..618f00c 100755
--- a/scripts/build-docs
+++ b/scripts/build-docs
@@ -18,13 +18,6 @@
 
 set -e
 
-if [[ "${TRAVIS}" == "true" ]] && \
-     ([[ "${TRAVIS_BRANCH}" != "master" ]] ||
-        [[ "${TRAVIS_PULL_REQUEST}" != "false" ]]); then
-  echo 'Detected non-master push in travis, exiting.'
-  exit 0
-fi
-
 if [[ -z "${SKIP_GAE_SDK}" ]]; then
   scripts/fetch_gae_sdk.py
   export PYTHONPATH="${PWD}/google_appengine:${PYTHONPATH}"
diff --git a/tox.ini b/tox.ini
index 46724cd..639b56b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,7 +42,7 @@ deps =
     {[testenv:cover]deps}
     python-gflags
     pyyaml
-    sphinx
+    sphinx>=1.3b2
     sphinx-rtd-theme
 commands = {toxinidir}/scripts/build-docs