diff --git a/requirements.txt b/requirements.txt
index 169b160ab819f1a4c2ca2a4ad6becd5f3b4c82ad..9fed6e160ae7d508bd276e9100e0f1cdb56b4e1a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,4 +13,4 @@ pytest-cache>=1.0
 pytest-cov>=2.5.1
 pytest-pep8>=1.0.6
 pytest>=3.2.1
-
+pytest-timeout>=1.3.4
diff --git a/setup.cfg b/setup.cfg
index cfcbfea95cdd0b95dd262f7a44e723e8df284400..6e349ac4e623a18c95c71711e6725c1ccd29b229 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,3 +3,4 @@ test=pytest
 
 [tool:pytest]
 norecursedirs = '.*', 'build', 'dist', 'CVS', '_darcs', '{arch}', '*.egg' lib lib64
+timeout = 5
diff --git a/setup.py b/setup.py
index e30af95e575bfebcccaddb02e71a18f823ff6062..bb00564dfc449bd76c55e7591b9a259843ff3003 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ setup(
     ],
     test_suite='tests',
     setup_requires=['pytest-runner'],
-    tests_require=['pytest-asyncio', 'pytest', 'mock'],
+    tests_require=['pytest-asyncio', 'pytest-timeout', 'pytest', 'mock'],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',