diff --git a/pytest.ini b/pytest.ini
index 7fcd91002..566e3f84e 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -33,3 +33,4 @@ qt_log_ignore =
     ^virtual void QSslSocketBackendPrivate::transmit\(\) SSL write failed with error: -9805
     ^virtual void QSslSocketBackendPrivate::transmit\(\) SSLRead failed with: -9805
     ^Type conversion already registered from type .*
+timeout = 25
diff --git a/tox.ini b/tox.ini
index 8bcc51022..b0c1b3956 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,6 +24,7 @@ deps =
     pytest-faulthandler==1.0.1
     pytest-sugar==0.5.1
     pytest-travis-fold==1.1.0
+    pytest-timeout==0.5
     xvfbwrapper==0.2.5
     hypothesis==1.12.0
     coverage==4.0.1