diff --git a/.travis.yml b/.travis.yml
index 9a8ff31..06eb0f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,17 @@
 language: python
 cache: pip
 
+env:
+  - VERSION_FLASK="0.10"
+  - VERSION_FLASK="dev"
+
 python:
   - "2.7"
 
+matrix:
+  allow_failures:
+    - env: VERSION_FLASK="dev"
+
 services:
   - elasticsearch
 
@@ -12,9 +20,10 @@ install:
   - "python setup.py install"
 
 before_script:
+  - 'if [[ $VERSION_FLASK = dev ]]; then pip install git+https://github.com/mitsuhiko/flask; else pip install --force flask==$VERSION_FLASK; fi'
   - sleep 10 # wait for elasticsearch
 
 script:
   - 'flake8'
-  - python setup.py test
+  - nosetests
   - "python setup.py build_sphinx"