diff --git a/src/requirements.txt b/src/requirements.txt
index ad57b5d073..b153fda3d5 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1,32 +1,4 @@
-# Functional requirements
-Django==1.8b2
-pytz
-django-bootstrap3
--e git+https://github.com/pretix/django-formset-js.git@master#egg=django-formset-js
--e git+https://github.com/pretix/cleanerversion.git@pretix#egg=cleanerversion
-django-compressor
-
-# Deployment / static file compilation requirements
-BeautifulSoup4
-html5lib
-slimit
-lxml
-
-# Polyfill for Python <3.4
-# Remove this, when Python 3.3 support is dropped
-flufl.enum
-
-# Debugging requirements
-django-debug-toolbar>=1.3.0
-
-# Testing requirements
-pyflakes
-pep8==1.5.7  # exact requirement by flake8 2.4.0
-pep8-naming
-flake8
-coveralls
-coverage
-selenium
-# PyVirtualDisplay
-# -e git+https://github.com/pretix/sauceclient.git@master#egg=sauceclient
-# travis
+-r requirements/production.txt
+-r requirements/py33.txt
+-r requirements/dev.txt
+-r requirements/testing.txt
diff --git a/src/requirements/dev.txt b/src/requirements/dev.txt
new file mode 100644
index 0000000000..2f51e53d24
--- /dev/null
+++ b/src/requirements/dev.txt
@@ -0,0 +1 @@
+django-debug-toolbar>=1.3.0
diff --git a/src/requirements/production.txt b/src/requirements/production.txt
new file mode 100644
index 0000000000..b1133f9d1a
--- /dev/null
+++ b/src/requirements/production.txt
@@ -0,0 +1,13 @@
+# Functional requirements
+Django==1.8b2
+pytz
+django-bootstrap3
+-e git+https://github.com/pretix/django-formset-js.git@master#egg=django-formset-js
+-e git+https://github.com/pretix/cleanerversion.git@pretix#egg=cleanerversion
+django-compressor
+
+# Deployment / static file compilation requirements
+BeautifulSoup4
+html5lib
+slimit
+lxml
diff --git a/src/requirements/py33.txt b/src/requirements/py33.txt
new file mode 100644
index 0000000000..10c4ed66b7
--- /dev/null
+++ b/src/requirements/py33.txt
@@ -0,0 +1,3 @@
+# Polyfill for Python <3.4
+# Remove this, when Python 3.3 support is dropped
+flufl.enum
diff --git a/src/requirements/testing.txt b/src/requirements/testing.txt
new file mode 100644
index 0000000000..3e426d2bd9
--- /dev/null
+++ b/src/requirements/testing.txt
@@ -0,0 +1,11 @@
+# Testing requirements
+pyflakes
+pep8==1.5.7  # exact requirement by flake8 2.4.0
+pep8-naming
+flake8
+coveralls
+coverage
+selenium
+# PyVirtualDisplay
+# -e git+https://github.com/pretix/sauceclient.git@master#egg=sauceclient
+# travis
diff --git a/src/tests/presale/test_checkout.py b/src/tests/presale/test_checkout.py
index bf6cfcf144..1ea4a88309 100644
--- a/src/tests/presale/test_checkout.py
+++ b/src/tests/presale/test_checkout.py
@@ -5,7 +5,7 @@ from django.test import TestCase
 from django.utils.timezone import now
 from datetime import timedelta
 
-from pretix.base.models import Item, Organizer, Event, ItemCategory, Quota, Property, PropertyValue, ItemVariation, User, \
+from pretix.base.models import Item, Organizer, Event, ItemCategory, Quota, User, \
     CartPosition, Question, Order, OrderPosition