diff --git a/.travis.yml b/.travis.yml
index d41f5b9..616e428 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ env:
     matrix:
         - CONDA_PY=2.7
         - CONDA_PY=3.5
+        - CONDA_PY=3.6
 
 branches:
   only:
@@ -31,7 +32,7 @@ deploy:
      local-dir: docs/_deploy/
      on:
        branch: master
-       condition: "$CONDA_PY = 3.5"
+       condition: "$CONDA_PY = 3.6"
      region: us-east-1
      detect_encoding: true
      access_key_id: $AWS_ACCESS_KEY
diff --git a/devtools/travis-ci/build_docs.sh b/devtools/travis-ci/build_docs.sh
index c3336e2..52c8961 100755
--- a/devtools/travis-ci/build_docs.sh
+++ b/devtools/travis-ci/build_docs.sh
@@ -8,15 +8,15 @@ conda create --yes -n docenv python=$CONDA_PY
 source activate docenv
 conda install -yq --use-local osprey
 
+# Install doc requirements
+conda install --yes --file docs/requirements.txt
+
 # We don't use conda for these:
 # sphinx_rtd_theme's latest releases are not available
 # neither is msmb_theme
 # neither is sphinx > 1.3.1 (fix #1892 autodoc problem)
 pip install -I sphinx==1.3.5 sphinx_rtd_theme==0.1.9 msmb_theme==1.2.0
 
-# Install doc requirements
-conda install --yes --file docs/requirements.txt
-
 # Make docs
 cd docs && make html && cd -