2 files changed, 8 insertions, 12 deletions
diff --git a/ci/before_install.sh b/ci/before_install.sh
index f696b85afc..9a3e192536 100755
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -24,19 +24,13 @@ echo 'python info:'
 ) | sed 's/^/  /'
 
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
-  echo "Install Python 2."
-  brew install python@2
-fi
-
-echo "Upgrade Python 2 pip."
-pip2.7 -q install --user --upgrade pip
-
-if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   echo "Upgrade Python 3."
   brew upgrade python
   echo "Upgrade Python 3 pip."
   pip3 -q install --user --upgrade pip
 else
+  echo "Upgrade Python 2 pip."
+  pip2.7 -q install --user --upgrade pip
   echo "Upgrade Python 3 pip."
   # Allow failure. pyenv pip3 on travis is broken:
   # https://github.com/travis-ci/travis-ci/issues/8363
diff --git a/ci/install.sh b/ci/install.sh
index 9deaa601b4..053549d6db 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -13,16 +13,18 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   brew reinstall -s libtool
 fi
 
-# Use default CC to avoid compilation problems when installing Python modules.
-echo "Install neovim module for Python 2."
-CC=cc pip2.7 -q install --user --upgrade neovim
-
 echo "Install neovim module for Python 3."
 # Allow failure. pyenv pip3 on travis is broken:
 # https://github.com/travis-ci/travis-ci/issues/8363
 CC=cc pip3 -q install --user --upgrade neovim || true
 
 if ! [ "${TRAVIS_OS_NAME}" = osx ] ; then
+  # Update PATH for pip.
+  export PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:$PATH"
+  # Use default CC to avoid compilation problems when installing Python modules.
+  echo "Install neovim module for Python 2."
+  CC=cc pip2.7 -q install --user --upgrade neovim
+
   echo "Install neovim RubyGem."
   gem install --no-document --version ">= 0.2.0" neovim
 fi