diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
index c79d5de83..ee005e608 100644
--- a/requirements/dev-requirements.txt
+++ b/requirements/dev-requirements.txt
@@ -1,10 +1,10 @@
 -r test-requirements.txt
-pygraphviz==1.3rc2
+autopep8
 beautifulsoup4
 django-debug-toolbar
 django-extensions
 flake8
 ipdb
 isort
-autopep8
+pygraphviz==1.3rc2
 pytest-ipdb==0.1-prerelease2
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 838f680d4..baf54c00b 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,5 +1,3 @@
-Django<1.9
-djangorestframework
 django-admin-bootstrapped
 django-bootstrap3
 django-bower
@@ -7,11 +5,13 @@ django-braces
 django-compressor
 django-crispy-forms
 django-extra-views
-django-vanilla-views
 django-sass-processor
+django-vanilla-views
+django<1.9
+djangorestframework
+git+git://github.com/interlegis/trml2pdf.git
 libsass
 psycopg2
 pytz
-PyYAML
-git+git://github.com/interlegis/trml2pdf.git
-Unipath
+pyyaml
+unipath
diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt
index 1052aad9f..476bc9c8e 100644
--- a/requirements/test-requirements.txt
+++ b/requirements/test-requirements.txt
@@ -6,4 +6,4 @@ pep8
 pytest
 pytest-cov
 pytest-django
-WebTest
+webtest