diff --git a/.travis.yml b/.travis.yml
index 0217e5dad..33c93038f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,12 @@ cache:
   directories:
     - $HOME/.cache/pip
 python:
+  - "pypy"
   - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
   - "nightly"
-  - "pypy"
 env:
   global:
     - TEST='-v --durations 25'
diff --git a/test-reqs.txt b/test-reqs.txt
index e06513a01..4475cec9a 100644
--- a/test-reqs.txt
+++ b/test-reqs.txt
@@ -3,7 +3,7 @@ pytest>=3.0
 pytest-cov
 mock
 six>=1.4
-Jinja2>=2.3
+Jinja2>=2.3,<2.9
 Pygments>=2.0
 docutils>=0.11
 snowballstemmer>=1.1