diff --git a/.travis.yml b/.travis.yml
index a6945a94..b6605385 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,8 @@ before_install:
     # something twice, but it doesn't really matter, because they are appended.
     - export PATH=$PATH:/opt/python/3.3/bin
     - export PATH=$PATH:/opt/python/3.5/bin
+    # 3.6 was not installed manually, but already is on the system. However
+    # it's not on path (unless 3.6 is selected).
     - export PATH=$PATH:/opt/python/3.6/bin
 install:
     - pip install --quiet tox-travis
diff --git a/travis_install.sh b/travis_install.sh
index 8299fd2d..1142ac3a 100755
--- a/travis_install.sh
+++ b/travis_install.sh
@@ -1,6 +1,13 @@
 #! /usr/bin/env bash
 set -e
 
+# 3.6 is already installed on Travis but not as root. This is problematic for
+# our virtualenv tests because we require the Python used to create a virtual
+# environment to be owned by root (or to be in a safe location which is not the
+# case here).
+sudo chown root: /opt/python/3.6/bin/python
+sudo chown root: /opt/python/3.6.3/bin/python
+
 if [[ $JEDI_TEST_ENVIRONMENT == "33" ]]; then
     VERSION=3.3
     DOWNLOAD=1
@@ -9,14 +16,6 @@ if [[ $JEDI_TEST_ENVIRONMENT == "35" ]]; then
     VERSION=3.5
     DOWNLOAD=1
 fi
-# 3.6 is already installed on Travis but not as root. This is problematic for
-# our virtualenv tests because we require the Python used to create a virtual
-# environment to be owned by root (or to be in a safe location which is not the
-# case here).
-if [[ $JEDI_TEST_ENVIRONMENT == "36" ]]; then
-    VERSION=3.6
-    DOWNLOAD=1
-fi
 
 if [[ -z $VERSION ]]; then
     echo "Environments should already be installed"