diff --git a/.travis.yml b/.travis.yml
index 0eb5da8f1ae4..65b9b4884577 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -104,13 +104,16 @@ before_install: |
     export PATH=/usr/lib/ccache:$PATH
     ;;
   osx)
+    set -e
     ci/silence brew update
     brew uninstall numpy gdal postgis
+    brew unlink python@2
     brew upgrade python
-    brew install ffmpeg imagemagick mplayer ccache font-wenquanyi-zen-hei
+    brew install ffmpeg imagemagick mplayer ccache
     hash -r
     which python
     python --version
+    set +e
     # We could install ghostscript and inkscape here to test svg and pdf
     # but this makes the test time really long.
     # brew install ghostscript inkscape
@@ -128,6 +131,8 @@ install:
   - |
     # Install dependencies from PyPI.
     python -mpip install --upgrade $PRE -r requirements/testing/travis_all.txt $EXTRAREQS $PINNEDVERS
+  - |
+    # Install optional dependencies from PyPI.
     # GUI toolkits are pip-installable only for some versions of Python so
     # don't fail if we can't install them.  Make it easier to check whether the
     # install was successful by trying to import the toolkit (sometimes, the