diff --git a/.travis.yml b/.travis.yml
index 3586b076..77a3ec98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@
 language: python
 sudo: false
 python:
-  - 3.5
+  - 3.6
   - 2.7
 env:
   - SPHINX_SPEC="Sphinx==1.2.3"
@@ -15,4 +15,8 @@ before_install:
   - pip install --upgrade pip setuptools  # Upgrade pip and setuptools to get ones with `wheel` support
   - pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --trusted-host wheels.astropy.org --trusted-host wheels2.astropy.org --use-wheel nose numpy matplotlib ${SPHINX_SPEC}
 script:
-  - python setup.py test
+  - |
+    python setup.py sdist
+    cd dist
+    pip install numpydoc* -v
+  - nosetests numpydoc