Merge de397d7 into 81f33b9

.travis.yml

@@ -24,6 +24,7 @@ env:
         - CONDA_DEPENDENCIES='scipy'
         - ASDF_GIT='git+https://github.com/spacetelescope/asdf.git#egg=asdf'
         #- ASTROPY_GIT='git+https://github.com/astropy/astropy.git@v3.1.x'
+        - ASTROPY_GIT='git+https://github.com/astropy/astropy.git#egg=astropy'
         - PIP_DEPENDENCIES="astropy pytest-astropy asdf"
         - ASTROPY_USE_SYSTEM_PYTEST=1
         - PYTEST_VERSION=3.6
@@ -39,9 +40,9 @@ matrix:
 
     # Don't wait for allowed failures
     fast_finish: true
-    
+
     include:
- 
+
         # Do a coverage test.
         - python: 3.5
           env: SETUP_CMD='test --coverage --open-files --remote-data'
@@ -69,7 +70,7 @@ matrix:
           env: ASTROPY_VERSION=development SETUP_CMD='test'
 
         - python: 3.6
-          env: PIP_DEPENDENCIES="$ASTROPY_GIT $ASDF_GIT" SETUP_CMD='test'
+          env: PIP_DEPENDENCIES="$ASTROPY_GIT $ASDF_GIT pytest-astropy" SETUP_CMD='test'
 
     allow_failures:
         - python: 3.5
@@ -82,7 +83,7 @@ matrix:
           env: ASTROPY_VERSION=development SETUP_CMD='test'
 
         - python: 3.6
-          env: PIP_DEPENDENCIES="$ASTROPY_GIT $ASDF_GIT" SETUP_CMD='test'
+          env: PIP_DEPENDENCIES="$ASTROPY_GIT $ASDF_GIT pytest-astropy" SETUP_CMD='test'
 
 
 install: