diff --git a/.travis.yml b/.travis.yml
index 7597da63..f0054318 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ install:
 
 script:
   - "if [[ ${TRAVIS_PYTHON_VERSION} != 'pypy' ]]; then make lint; fi"
-  - py.test tests/ --cov raven --cov-report term-missing
+  - py.test tests/ --cov raven --cov-report term-missing --timeout 10
 
 matrix:
   allow_failures:
diff --git a/setup.py b/setup.py
index 9a7d2377..d2f51b2e 100755
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,7 @@ tests_require = [
     'pytest>=2.7.0,<2.8.0',
     'pytest-cov>=1.4',
     'pytest-django>=2.8.0,<2.7.0',
+    'pytest-timeout==0.4',
     'requests',
     'tornado',
     'webob',
diff --git a/test-requirements.txt b/test-requirements.txt
index 4925081f..1484a814 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1,3 @@
 pytest-django
+pytest-timeout
 -e .[dev,tests]