diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 86a0c19c..7963900e 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -5,7 +5,7 @@ import os
 import signal
 import sys
 
-from mopidy.internal.gi import Gst  # noqa: Import to initialize
+from mopidy.internal.gi import Gst  # noqa: F401
 
 try:
     # Make GObject's mainloop the event loop for python-dbus
diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py
index 21a6a00b..ec5c9a99 100644
--- a/mopidy/config/__init__.py
+++ b/mopidy/config/__init__.py
@@ -9,12 +9,15 @@ import re
 from mopidy import compat
 from mopidy.compat import configparser
 from mopidy.config import keyring
-from mopidy.config.schemas import *  # noqa
-from mopidy.config.types import *  # noqa
+from mopidy.config.schemas import *
+from mopidy.config.types import *
 from mopidy.internal import path, versioning
 
 logger = logging.getLogger(__name__)
 
+# flake8: noqa:
+# TODO: Update this to be flake8 compliant
+
 _core_schema = ConfigSchema('core')
 _core_schema['cache_dir'] = Path()
 _core_schema['config_dir'] = Path()
diff --git a/tests/models/test_fields.py b/tests/models/test_fields.py
index bf842fd5..3374c822 100644
--- a/tests/models/test_fields.py
+++ b/tests/models/test_fields.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 import unittest
 
-from mopidy.models.fields import *  # noqa: F403
+from mopidy.models.fields import Collection, Field, Integer, String
 
 
 def create_instance(field):
diff --git a/tox.ini b/tox.ini
index da6bcc38..b39fc68b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,8 @@ commands = sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 [testenv:flake8]
 deps =
     flake8
-    flake8-import-order
+# TODO: Re-enable once https://github.com/PyCQA/flake8-import-order/issues/79 is released.
+#    flake8-import-order
     pep8-naming
 commands = flake8 --show-source --statistics mopidy tests