diff --git a/dev-requirements.txt b/dev-requirements.txt
index 9ed5ac2a..bd3f209e 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -4,3 +4,6 @@ sphinx==1.2.3
 pytest==2.6.4
 ws4py==0.3.4
 pep8==1.5.7
+pytest
+pytest-timeout
+pytest-capturelog
diff --git a/tox.ini b/tox.ini
index f698cd6f..a6c23dee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,4 +10,4 @@ ignore = E501
 
 [pytest]
 norecursedirs = old_tests .tox
-
+timeout = 10