diff --git a/requirements/deps/mock.txt b/requirements/deps/mock.txt
new file mode 100644
index 00000000000..fc5a383077c
--- /dev/null
+++ b/requirements/deps/mock.txt
@@ -0,0 +1 @@
+mock>=1.3
diff --git a/requirements/deps/nose.txt b/requirements/deps/nose.txt
new file mode 100644
index 00000000000..7331c33c184
--- /dev/null
+++ b/requirements/deps/nose.txt
@@ -0,0 +1 @@
+nose>=1.3.7
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 5d564921486..a1f3b72de8f 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -1,5 +1,3 @@
 Sphinx
-SQLAlchemy
-https://github.com/celery/billiard/zipball/master
-https://github.com/celery/py-amqp/zipball/master
-https://github.com/celery/kombu/zipball/master
+-r requirements/extras/sqlalchemy.txt
+-r requirements/dev.txt
diff --git a/requirements/extras/beanstalk.rst b/requirements/extras/beanstalk.rst
deleted file mode 100644
index c62c81bd2d0..00000000000
--- a/requirements/extras/beanstalk.rst
+++ /dev/null
@@ -1 +0,0 @@
-beanstalkc
diff --git a/requirements/jython.txt b/requirements/jython.txt
index 4427a9a5f01..16a2ad15f46 100644
--- a/requirements/jython.txt
+++ b/requirements/jython.txt
@@ -1,2 +1,2 @@
-threadpool
 multiprocessing
+-r extras/threads.txt
diff --git a/requirements/security.txt b/requirements/security.txt
index 9292484f98a..9ae559b69c2 100644
--- a/requirements/security.txt
+++ b/requirements/security.txt
@@ -1 +1 @@
-PyOpenSSL
+-r extras/auth.txt
diff --git a/requirements/test-ci.txt b/requirements/test-ci.txt
index e71d640f208..0814d86ba44 100644
--- a/requirements/test-ci.txt
+++ b/requirements/test-ci.txt
@@ -1,2 +1,3 @@
 coverage>=3.0
 coveralls
+-r extras/redis.txt
diff --git a/requirements/test-pypy3.txt b/requirements/test-pypy3.txt
index 932a8957f78..dc9901d75eb 100644
--- a/requirements/test-pypy3.txt
+++ b/requirements/test-pypy3.txt
@@ -1 +1 @@
-mock
+-r deps/mock.txt
diff --git a/requirements/test.txt b/requirements/test.txt
index 0d0b3c69763..8ad2e9a3cdc 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,3 +1,3 @@
+-r deps/mock.txt
+-r deps/nose.txt
 unittest2>=0.5.1
-nose
-mock>=1.0.1
diff --git a/requirements/test3.txt b/requirements/test3.txt
index f3c7e8e6ffb..881384714e8 100644
--- a/requirements/test3.txt
+++ b/requirements/test3.txt
@@ -1 +1 @@
-nose
+-r deps/nose.txt
diff --git a/setup.py b/setup.py
index 136318076ed..9a86098cadb 100644
--- a/setup.py
+++ b/setup.py
@@ -116,13 +116,24 @@ def strip_comments(l):
     return l.split('#', 1)[0].strip()
 
 
-def reqs(*f):
+def _pip_requirement(req):
+    if req.startswith('-r '):
+        _, path = req.split()
+        return reqs(*path.split('/'))
+    return [req]
+
+
+def _reqs(*f):
     return [
-        r for r in (
+        _pip_requirement(r) for r in (
             strip_comments(l) for l in open(
                 os.path.join(os.getcwd(), 'requirements', *f)).readlines()
         ) if r]
 
+
+def reqs(*f):
+    return [req for subreq in _reqs(*f) for req in subreq]
+
 install_requires = reqs('default.txt')
 if JYTHON:
     install_requires.extend(reqs('jython.txt'))
@@ -164,6 +175,8 @@ def reqs(*f):
 extras_require = {x: extras(x + '.txt') for x in features}
 extra['extras_require'] = extras_require
 
+print(tests_require)
+
 # -*- %%% -*-
 
 setup(