diff --git a/.travis.yml b/.travis.yml
index af58c0f6..f57b87ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@
 language: python
 sudo: false
 python:
+    - 3.5
     - 3.4
     - 3.3
 before_install:
@@ -10,7 +11,7 @@ before_install:
     - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
 install:
     - pip install -f travis-wheels/wheelhouse -r dev-requirements.txt .
-    - pip install -f travis-wheels/wheelhouse ipython[notebook]
+    - pip install -f travis-wheels/wheelhouse notebook
 script:
     - py.test --cov jupyterhub jupyterhub/tests -v
 after_success:
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 71546ccb..28159b41 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,4 +1,4 @@
 -r requirements.txt
 coveralls
 pytest-cov
-pytest
+pytest>=2.8