diff --git a/mopidy/internal/playlists.py b/mopidy/internal/playlists.py
index e80588c9..5c7c8fc4 100644
--- a/mopidy/internal/playlists.py
+++ b/mopidy/internal/playlists.py
@@ -6,9 +6,9 @@ from mopidy.compat import configparser
 from mopidy.internal import validation
 
 try:
-    import xml.etree.cElementTree as elementtree
+    import xml.etree.cElementTree as elementtree  # noqa: N813
 except ImportError:
-    import xml.etree.ElementTree as elementtree
+    import xml.etree.ElementTree as elementtree  # noqa: N813
 
 
 def parse(data):
diff --git a/tests/config/test_config.py b/tests/config/test_config.py
index fa2285b8..a20f2317 100644
--- a/tests/config/test_config.py
+++ b/tests/config/test_config.py
@@ -164,7 +164,7 @@ __HASH10__ = foo # = should all be treated as a comment."""
 
 
 class PreProcessorTest(unittest.TestCase):
-    maxDiff = None  # Show entire diff.
+    maxDiff = None  # Show entire diff.  # noqa: N815
 
     def test_empty_config(self):
         result = config._preprocess('')
@@ -230,7 +230,7 @@ class PreProcessorTest(unittest.TestCase):
 
 
 class PostProcessorTest(unittest.TestCase):
-    maxDiff = None  # Show entire diff.
+    maxDiff = None  # Show entire diff.  # noqa: N815
 
     def test_empty_config(self):
         result = config._postprocess('[__COMMENTS__]')
diff --git a/tests/core/test_playback.py b/tests/core/test_playback.py
index 6d320b4e..59d90b92 100644
--- a/tests/core/test_playback.py
+++ b/tests/core/test_playback.py
@@ -497,7 +497,7 @@ class TestCurrentAndPendingTlTrack(BaseTest):
     'mopidy.core.playback.listener.CoreListener', spec=core.CoreListener)
 class EventEmissionTest(BaseTest):
 
-    maxDiff = None
+    maxDiff = None  # noqa: N815
 
     def test_play_when_stopped_emits_events(self, listener_mock):
         tl_tracks = self.core.tracklist.get_tl_tracks()
diff --git a/tests/internal/test_path.py b/tests/internal/test_path.py
index dec80f1a..2cfe4ebd 100644
--- a/tests/internal/test_path.py
+++ b/tests/internal/test_path.py
@@ -237,7 +237,7 @@ class ExpandPathTest(unittest.TestCase):
 
 
 class FindMTimesTest(unittest.TestCase):
-    maxDiff = None
+    maxDiff = None  # noqa: N815
 
     def setUp(self):  # noqa: N802
         self.tmpdir = tempfile.mkdtemp(b'.mopidy-tests')
diff --git a/tests/local/test_json.py b/tests/local/test_json.py
index 169ba743..8f46bd36 100644
--- a/tests/local/test_json.py
+++ b/tests/local/test_json.py
@@ -9,7 +9,7 @@ from tests import path_to_data_dir
 
 
 class BrowseCacheTest(unittest.TestCase):
-    maxDiff = None
+    maxDiff = None  # noqa: N815
 
     def setUp(self):  # noqa: N802
         self.uris = ['local:track:foo/bar/song1',