diff --git a/src/requirements/dev.txt b/src/requirements/dev.txt
index 9cd72aced..86d689a7c 100644
--- a/src/requirements/dev.txt
+++ b/src/requirements/dev.txt
@@ -2,6 +2,7 @@ django-debug-toolbar>=1.3.0,<2.0
 # Testing requirements
 pyflakes
 pep8==1.5.7  # exact requirement by flake8 2.4.0
+pyflakes==1.1.0  # later version causes problems currently
 pep8-naming
 flake8
 coveralls
diff --git a/src/tests/settings.py b/src/tests/settings.py
index b0bbe76cf..1132d7782 100644
--- a/src/tests/settings.py
+++ b/src/tests/settings.py
@@ -1,10 +1,12 @@
+import os
+
 from pretix.settings import *  # NOQA
 
 TEST_DIR = os.path.dirname(__file__)
 
-TEMPLATES[0]['DIRS'].append(os.path.join(TEST_DIR, 'templates'))
+TEMPLATES[0]['DIRS'].append(os.path.join(TEST_DIR, 'templates'))  # NOQA
 
-INSTALLED_APPS.append('tests.testdummy')
+INSTALLED_APPS.append('tests.testdummy')  # NOQA
 
 MEDIA_ROOT = os.path.join(TEST_DIR, 'media')