diff --git a/setup.cfg b/setup.cfg
index 5e409001..586da78b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,5 @@
+[flake8]
+application-import-names = mopidy,tests
+
 [wheel]
 universal = 1
diff --git a/tox.ini b/tox.ini
index 367db508..a688304b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,5 +15,7 @@ changedir = docs
 commands = sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 
 [testenv:flake8]
-deps = flake8
+deps =
+    flake8
+    flake8-import-order
 commands = flake8 docs/ fabfile.py mopidy/ setup.py tests/