diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
new file mode 100644
index 000000000..93204b9ba
--- /dev/null
+++ b/requirements/dev-requirements.txt
@@ -0,0 +1,7 @@
+-r test-requirements.txt
+beautifulsoup4
+django-debug-toolbar
+django-extensions
+ipdb
+pygraphviz
+pytest-ipdb==0.1-prerelease2
diff --git a/requirements.txt b/requirements/requirements.txt
similarity index 55%
rename from requirements.txt
rename to requirements/requirements.txt
index 785cf1781..bdd2b5c7c 100644
--- a/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,12 +1,6 @@
 Django
-MySQL-python
-psycopg2
-beautifulsoup4
-model_mommy
 django-admin-bootstrapped
 django-bootstrap3
+MySQL-python
+psycopg2
 pytz
-
-ipdb
-django-extensions
-pygraphviz
diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt
new file mode 100644
index 000000000..619ff8dc0
--- /dev/null
+++ b/requirements/test-requirements.txt
@@ -0,0 +1,10 @@
+-r requirements.txt
+clonedigger
+coverage
+django-webtest
+model_mommy
+pep8
+pytest
+pytest-cov
+pytest-django
+WebTest