diff --git a/.travis.yml b/.travis.yml
index 6ca23723..2627de70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,16 +9,25 @@ os:
 
 env:
   global:
+    - PIP_FALLBACK=False
     - SETUP_XVFB=True
-    - CONDA_DEPENDENCIES="pytest matplotlib nose coverage freetype=2.5.5"
+    - CONDA_DEPENDENCIES="pytest matplotlib nose coverage freetype"
     - PIP_DEPENDENCIES="pytest-cov coveralls"
   matrix:
-    - PYTHON_VERSION=3.4 MATPLOTLIB_VERSION=1.5
-    - PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=1.5
-    - PYTHON_VERSION=3.5 MATPLOTLIB_VERSION=1.5
-    - PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=2.0
-    - PYTHON_VERSION=3.5 MATPLOTLIB_VERSION=2.0
-    - PYTHON_VERSION=3.6 MATPLOTLIB_VERSION=2.0
+
+    - PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=1.5 FREETYPE_VERSION=2.5.5
+
+    - PYTHON_VERSION=3.4 MATPLOTLIB_VERSION=1.5 FREETYPE_VERSION=2.5.5
+
+    - PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=2.0 FREETYPE_VERSION=2.8
+    - PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=2.1 FREETYPE_VERSION=2.8
+    - PYTHON_VERSION=2.7 MATPLOTLIB_VERSION=2.2 FREETYPE_VERSION=2.8
+
+    - PYTHON_VERSION=3.5 MATPLOTLIB_VERSION=2.0 FREETYPE_VERSION=2.8
+    - PYTHON_VERSION=3.6 MATPLOTLIB_VERSION=2.1 FREETYPE_VERSION=2.8
+    - PYTHON_VERSION=3.7 MATPLOTLIB_VERSION=2.2 FREETYPE_VERSION=2.8
+
+    - PYTHON_VERSION=3.7 MATPLOTLIB_VERSION=3.0 FREETYPE_VERSION=2.9
 
     # The following build is meant to check that dependencies get set up correctly, but currently
     # the image tests fail, which should be investigated.
@@ -29,7 +38,7 @@ install:
     # We use the ci-helpers package from the Astropy project to set up conda
     # with any requested dependencies above.
     - git clone git://github.com/astropy/ci-helpers.git
-    - source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh
+    - source ci-helpers/travis/setup_conda.sh
 
     # Need to use develop instead of install to make sure coverage works
     - python setup.py develop
diff --git a/appveyor.yml b/appveyor.yml
index 442325bf..3863f9c9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,7 +19,16 @@ environment:
         CONDA_DEPENDENCIES: "matplotlib=1.5 nose"
 
       - PYTHON_VERSION: "3.6"
-        CONDA_DEPENDENCIES: "matplotlib=2.0.1 nose"
+        CONDA_DEPENDENCIES: "matplotlib=2.0 nose"
+
+      - PYTHON_VERSION: "3.6"
+        CONDA_DEPENDENCIES: "matplotlib=2.1 nose"
+
+      - PYTHON_VERSION: "3.7"
+        CONDA_DEPENDENCIES: "matplotlib=2.2 nose"
+
+      - PYTHON_VERSION: "3.7"
+        CONDA_DEPENDENCIES: "matplotlib=3.0 nose"
 
 platform:
     -x64