diff --git a/.isort.cfg b/.isort.cfg
index 2fee656bb..3fa2b751d 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -16,9 +16,10 @@ known_picard=picard
 known_picard_ui=picard.ui
 known_qt=PyQt5
 known_resources=picard.resources
+known_test=test.*
 multi_line_output=3
 order_by_type=True
-sections=FUTURE,STDLIB,THIRDPARTY,QT,PICARD,LOCALFOLDER,RESOURCES,PICARD_UI
+sections=FUTURE,STDLIB,THIRDPARTY,QT,TEST,PICARD,LOCALFOLDER,RESOURCES,PICARD_UI
 skip_glob=**/picard/ui/ui_*.py
 skip=./tagger.py,picard/const/attributes.py,picard/const/countries.py,picard/resources.py,scripts/picard.in,picard/const/__init__.py,picard/formats/__init__.py,picard/coverart/providers/__init__.py
 not_skip=__init__.py
diff --git a/test/formats/common.py b/test/formats/common.py
index 406960bdb..2d58cfc93 100644
--- a/test/formats/common.py
+++ b/test/formats/common.py
@@ -2,11 +2,12 @@
 import os.path
 import shutil
 from tempfile import mkstemp
-from test.picardtestcase import PicardTestCase
 import unittest
 
 import mutagen
 
+from test.picardtestcase import PicardTestCase
+
 from picard import config
 import picard.formats
 from picard.formats import ext_to_format
diff --git a/test/formats/test_id3.py b/test/formats/test_id3.py
index 3e71a9846..c07b260e7 100644
--- a/test/formats/test_id3.py
+++ b/test/formats/test_id3.py
@@ -1,4 +1,5 @@
 import os.path
+
 from test.picardtestcase import PicardTestCase
 
 from picard import config
diff --git a/test/formats/test_vorbis.py b/test/formats/test_vorbis.py
index 9fc679ea9..143fe61d4 100644
--- a/test/formats/test_vorbis.py
+++ b/test/formats/test_vorbis.py
@@ -1,5 +1,6 @@
 import logging
 import os
+
 from test.picardtestcase import PicardTestCase
 
 from picard import (
diff --git a/test/test_acoustid.py b/test/test_acoustid.py
index 7fc504deb..6ca725a19 100644
--- a/test/test_acoustid.py
+++ b/test/test_acoustid.py
@@ -1,5 +1,6 @@
 import json
 import os
+
 from test.picardtestcase import PicardTestCase
 
 from picard import config
diff --git a/test/test_api_helpers.py b/test/test_api_helpers.py
index e309c601e..c4a65b23f 100644
--- a/test/test_api_helpers.py
+++ b/test/test_api_helpers.py
@@ -1,6 +1,7 @@
-from test.picardtestcase import PicardTestCase
 from unittest.mock import MagicMock
 
+from test.picardtestcase import PicardTestCase
+
 from picard import config
 from picard.webservice import WebService
 from picard.webservice.api_helpers import (
diff --git a/test/test_browser.py b/test/test_browser.py
index f14781353..8cf5a49b9 100644
--- a/test/test_browser.py
+++ b/test/test_browser.py
@@ -1,10 +1,11 @@
-from test.picardtestcase import PicardTestCase
 from unittest.mock import patch
 from urllib.parse import (
     parse_qs,
     urlparse,
 )
 
+from test.picardtestcase import PicardTestCase
+
 from picard.browser.filelookup import FileLookup
 from picard.util import webbrowser2
 
diff --git a/test/test_bytes2human.py b/test/test_bytes2human.py
index 7700a6377..bacc12705 100644
--- a/test/test_bytes2human.py
+++ b/test/test_bytes2human.py
@@ -2,6 +2,7 @@ import os.path
 import shutil
 import sys
 import tempfile
+
 from test.picardtestcase import PicardTestCase
 
 from picard.i18n import setup_gettext
diff --git a/test/test_compatid3.py b/test/test_compatid3.py
index 94ed87e24..72fd1c35d 100644
--- a/test/test_compatid3.py
+++ b/test/test_compatid3.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from test.picardtestcase import PicardTestCase
-
 from mutagen import id3
 
+from test.picardtestcase import PicardTestCase
+
 from picard.formats.id3 import id3text
 from picard.formats.mutagenext import compatid3
 
diff --git a/test/test_config.py b/test/test_config.py
index d30a9f527..980f351c7 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -21,6 +21,7 @@ import logging
 import os
 import shutil
 from tempfile import mkdtemp
+
 from test.picardtestcase import PicardTestCase
 
 from picard.config import (
diff --git a/test/test_coverart_image.py b/test/test_coverart_image.py
index ff8c42e79..cab7762b6 100644
--- a/test/test_coverart_image.py
+++ b/test/test_coverart_image.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 # coding: utf-8
 import os.path
+import unittest
+
 from test.picardtestcase import (
     PicardTestCase,
     create_fake_png,
 )
-import unittest
 
 from picard.const.sys import IS_WIN
 from picard.coverart.image import (
diff --git a/test/test_coverart_utils.py b/test/test_coverart_utils.py
index 0380ad9dd..fb59b32b3 100644
--- a/test/test_coverart_utils.py
+++ b/test/test_coverart_utils.py
@@ -3,6 +3,7 @@
 import os.path
 import shutil
 import tempfile
+
 from test.picardtestcase import PicardTestCase
 
 from picard.coverart.utils import translate_caa_type
diff --git a/test/test_file.py b/test/test_file.py
index d60ed0ee2..9dbf1d327 100644
--- a/test/test_file.py
+++ b/test/test_file.py
@@ -1,6 +1,7 @@
 import os
 import shutil
 from tempfile import mkdtemp
+
 from test.picardtestcase import PicardTestCase
 
 from picard.file import File
diff --git a/test/test_filesystem.py b/test/test_filesystem.py
index a67361116..b6005ff59 100644
--- a/test/test_filesystem.py
+++ b/test/test_filesystem.py
@@ -3,6 +3,7 @@ from contextlib import suppress
 import os.path
 import shutil
 from tempfile import mkdtemp
+
 from test.picardtestcase import PicardTestCase
 
 from picard import config
diff --git a/test/test_mbjson.py b/test/test_mbjson.py
index 5f4f761b1..d76b5d316 100644
--- a/test/test_mbjson.py
+++ b/test/test_mbjson.py
@@ -1,5 +1,6 @@
 import json
 import os
+
 from test.picardtestcase import PicardTestCase
 
 from picard import config
diff --git a/test/test_releaseversions.py b/test/test_releaseversions.py
index b07cdfebc..3baa7a2a6 100644
--- a/test/test_releaseversions.py
+++ b/test/test_releaseversions.py
@@ -3,6 +3,7 @@ import os.path
 import shutil
 import sys
 import tempfile
+
 from test.picardtestcase import PicardTestCase
 
 from picard import config
diff --git a/test/test_script.py b/test/test_script.py
index 05b034a84..d3eddd5d8 100644
--- a/test/test_script.py
+++ b/test/test_script.py
@@ -1,6 +1,7 @@
-from test.picardtestcase import PicardTestCase
 from unittest.mock import MagicMock
 
+from test.picardtestcase import PicardTestCase
+
 from picard import config
 from picard.const import DEFAULT_FILE_NAMING_FORMAT
 from picard.metadata import Metadata
diff --git a/test/test_util_astrcmp.py b/test/test_util_astrcmp.py
index 8488c1099..f94a98706 100644
--- a/test/test_util_astrcmp.py
+++ b/test/test_util_astrcmp.py
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-from test.picardtestcase import PicardTestCase
 import unittest
 
+from test.picardtestcase import PicardTestCase
+
 from picard.util.astrcmp import astrcmp_py
 
 try:
diff --git a/test/test_util_filenaming.py b/test/test_util_filenaming.py
index a143d0557..bdb7a0838 100644
--- a/test/test_util_filenaming.py
+++ b/test/test_util_filenaming.py
@@ -3,9 +3,10 @@
 import os
 import os.path
 import sys
-from test.picardtestcase import PicardTestCase
 import unittest
 
+from test.picardtestcase import PicardTestCase
+
 from picard.const.sys import (
     IS_MACOS,
     IS_WIN,
diff --git a/test/test_utils.py b/test/test_utils.py
index b3b8b1faf..464fd53a2 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -3,9 +3,10 @@
 import builtins
 from collections import namedtuple
 import os.path
-from test.picardtestcase import PicardTestCase
 import unittest
 
+from test.picardtestcase import PicardTestCase
+
 from picard import util
 from picard.const.sys import IS_WIN
 from picard.util import (
diff --git a/test/test_webservice.py b/test/test_webservice.py
index 26ae49297..313b513da 100644
--- a/test/test_webservice.py
+++ b/test/test_webservice.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from test.picardtestcase import PicardTestCase
 from unittest.mock import (
     MagicMock,
     patch,
 )
 
+from test.picardtestcase import PicardTestCase
+
 from picard import config
 from picard.webservice import (
     UnknownResponseParserError,