diff --git a/requirements/dev.txt b/requirements/dev.txt
index 1cae1f9..ea06dfc 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -1,8 +1,2 @@
--r test.txt
-bumpversion==0.5.3
-grip==3.3.0
-ipdb==0.10.0
-ipython==4.0.0
-ipython-genutils==0.1.0
-pre-commit==0.9.0
-pylint==1.4.4
\ No newline at end of file
+-r ../requirements.txt
+-r setup.txt
diff --git a/requirements/docs.txt b/requirements/docs.txt
new file mode 100644
index 0000000..0c6207f
--- /dev/null
+++ b/requirements/docs.txt
@@ -0,0 +1,4 @@
+pygments==2.2.0
+Sphinx==1.6.2
+sphinx-rtd-theme==0.2.4
+sphinxcontrib-plantuml==0.8.1
diff --git a/requirements/setup.txt b/requirements/setup.txt
new file mode 100644
index 0000000..6d230cb
--- /dev/null
+++ b/requirements/setup.txt
@@ -0,0 +1,17 @@
+autoenv==1.0.0
+autopep8
+bumplus==0.0.8
+bumpversion==0.5.3
+docker-compose==1.16.1
+elpy==1.15.0
+epc==0.0.5
+flake8==3.3.0
+importmagic==0.1.7
+ipdb==0.10.3
+ipython==6.0.0
+ipython-genutils==0.2.0
+jedi==0.10.2
+pre-commit==0.15.2
+pylint==1.7.1
+restview==2.7.0
+yapf==0.16.1
diff --git a/requirements/test.txt b/requirements/test.txt
index 2e35d02..82a84a3 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,3 +1,6 @@
--r ../requirements.txt
-nose==1.3.7
-tox==2.1.1
+-r dev.txt
+ansible-lint==3.4.3
+green==2.8.1
+mock==2.0.0
+PyHamcrest==1.9.0
+tox==2.7.0