diff --git a/tox.ini b/tox.ini
index 7e7af4ab1..18a1b9516 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,6 +21,7 @@ deps =
     pytest-qt==1.7.0
     pytest-mock==0.8.1
     pytest-html==1.6
+    pytest-faulthandler==1.0.1
     hypothesis==1.11.4
     coverage==4.0.0
     pytest-cov==2.2.0
@@ -30,7 +31,7 @@ deps =
     Werkzeug==0.10.4
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} -m py.test --strict -rfEsw --cov qutebrowser --cov-report xml --cov-report=html --cov-report= {posargs:tests}
+    {envpython} -m py.test --strict -rfEsw --cov qutebrowser --cov-report xml --cov-report=html --cov-report= --faulthandler-timeout=20 {posargs:tests}
     {envpython} scripts/dev/check_coverage.py {posargs}
 
 [testenv:mkvenv]