diff --git a/requirements.txt b/requirements.txt
index dbe3726f9fb87167dd65e09a12d84b4234afa228..9c677e07032b85dfc6808a91efbc16162c2c3f0a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,3 +12,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 72e69bcd7e7b8cc0c2806ea1f270179e186b35b9..2579a0aff14d1696468b8c5e2e5a3c987fed26ae 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,5 @@
 [aliases]
 test=pytest
 
-
+[tool:pytest]
+timeout = 5
diff --git a/setup.py b/setup.py
index c8fe04eedac91117df2507a4e1224fe8463639be..72a2d8feb2f8b5df54c2812865452bc53d800beb 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@ tests_require = [
     'pytest-cache>=1.0',
     'pytest-cov>=2.5.1',
     'pytest-pep8>=1.0.6',
+    'pytest-timeout>=1.3.4',
     'pytest>=3.2.1',
     'uvloop>=0.8.1',
 ]