diff --git a/setup.py b/setup.py
index 1b7454a..098a6bb 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,6 @@
     requirements.append("cffi>=1.4.1")
     setup_requirements.append("cffi>=1.4.1")
 
-# If you add a new dep here you probably need to add it in the tox.ini as well
 test_requirements = [
     "pytest",
     "pretend",
diff --git a/tox.ini b/tox.ini
index 5cba83e..424dc5b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,14 +2,9 @@
 envlist = py26,py27,pypy,py33,py34,py35,docs,pep8,py3pep8
 
 [testenv]
-# If you add a new dep here you probably need to add it in setup.py as well
 deps =
     coverage
-    iso8601
-    pretend
-    pytest
-    hypothesis>=1.11.4
-    pyasn1_modules
+    .[test]
     ./vectors
 passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME
 commands =