diff --git a/test/pyxtest/conftest.py b/test/pyxtest/conftest.py
index 1368076684..b74690f831 100644
--- a/test/pyxtest/conftest.py
+++ b/test/pyxtest/conftest.py
@@ -9,8 +9,9 @@ import warnings
 import pytest
 from pathlib import Path
 
-from xserver import ExternalXServer, XServerProcess
+import pytest
 from xclient import RawX11Connection, X11ConnectionError, XlibConnection
+from xserver import ExternalXServer, XServerProcess
 
 
 def pytest_addoption(parser):
diff --git a/test/pyxtest/test_fb.py b/test/pyxtest/test_fb.py
index 28e08964ca..ced3766574 100644
--- a/test/pyxtest/test_fb.py
+++ b/test/pyxtest/test_fb.py
@@ -7,7 +7,6 @@ import tempfile
 import time
 
 import pytest
-
 from proto import pcf, x11
 from xclient import X11Error
 
diff --git a/test/pyxtest/test_font.py b/test/pyxtest/test_font.py
index 492d2f7e67..14a15107fc 100644
--- a/test/pyxtest/test_font.py
+++ b/test/pyxtest/test_font.py
@@ -6,7 +6,6 @@ import os
 import time
 
 import pytest
-
 from proto import x11
 from xclient import X11Reply
 
diff --git a/test/pyxtest/test_glamor.py b/test/pyxtest/test_glamor.py
index 7c1bb5132e..087abdf0fc 100644
--- a/test/pyxtest/test_glamor.py
+++ b/test/pyxtest/test_glamor.py
@@ -7,7 +7,6 @@ import tempfile
 import time
 
 import pytest
-
 from proto import pcf, x11
 from xclient import X11Error
 
diff --git a/test/pyxtest/test_glx.py b/test/pyxtest/test_glx.py
index fd13de8be3..33b650a189 100644
--- a/test/pyxtest/test_glx.py
+++ b/test/pyxtest/test_glx.py
@@ -6,7 +6,6 @@ import struct
 import time
 
 import pytest
-
 from proto import glx
 from xclient import Extension, X11Error, X11Reply
 
diff --git a/test/pyxtest/test_present.py b/test/pyxtest/test_present.py
index 73b33c5685..140ead7cfe 100644
--- a/test/pyxtest/test_present.py
+++ b/test/pyxtest/test_present.py
@@ -3,7 +3,6 @@
 # Tests for Present extension.
 
 import pytest
-
 from proto import present
 from xclient import BadWindow, Extension, X11Error
 
diff --git a/test/pyxtest/test_randr.py b/test/pyxtest/test_randr.py
index c3487d2188..addf8e24c1 100644
--- a/test/pyxtest/test_randr.py
+++ b/test/pyxtest/test_randr.py
@@ -5,7 +5,6 @@
 import struct
 
 import pytest
-
 from proto import randr
 from xclient import BadIDChoice, BadLength, Extension, X11Error, X11Reply
 
diff --git a/test/pyxtest/test_record.py b/test/pyxtest/test_record.py
index 1a3b7f951c..9097495c45 100644
--- a/test/pyxtest/test_record.py
+++ b/test/pyxtest/test_record.py
@@ -5,7 +5,6 @@
 import time
 
 import pytest
-
 from proto import record
 from xclient import Extension
 
diff --git a/test/pyxtest/test_render.py b/test/pyxtest/test_render.py
index acfe61f4bb..3c49facf3b 100644
--- a/test/pyxtest/test_render.py
+++ b/test/pyxtest/test_render.py
@@ -5,7 +5,6 @@
 import struct
 
 import pytest
-
 from proto import render
 from xclient import Extension, X11Error, X11Reply
 
diff --git a/test/pyxtest/test_screensaver.py b/test/pyxtest/test_screensaver.py
index b34dd05717..9753a18d68 100644
--- a/test/pyxtest/test_screensaver.py
+++ b/test/pyxtest/test_screensaver.py
@@ -5,7 +5,6 @@
 import time
 
 import pytest
-
 from proto import screensaver, x11
 from xclient import Extension
 
diff --git a/test/pyxtest/test_shm.py b/test/pyxtest/test_shm.py
index b8ed0761e8..daea4a2bd0 100644
--- a/test/pyxtest/test_shm.py
+++ b/test/pyxtest/test_shm.py
@@ -5,7 +5,6 @@
 import struct
 
 import pytest
-
 from proto import shm
 from xclient import Extension, X11Reply
 
diff --git a/test/pyxtest/test_sync.py b/test/pyxtest/test_sync.py
index d40ea49f6f..bd5fb07540 100644
--- a/test/pyxtest/test_sync.py
+++ b/test/pyxtest/test_sync.py
@@ -6,9 +6,8 @@ import struct
 import time
 
 import pytest
-
 from proto import sync
-from xclient import Extension, X11Error, X11Reply, RawX11Connection
+from xclient import Extension, RawX11Connection, X11Error, X11Reply
 
 
 @pytest.fixture
diff --git a/test/pyxtest/test_vidmode.py b/test/pyxtest/test_vidmode.py
index cec3604221..a3ee293b41 100644
--- a/test/pyxtest/test_vidmode.py
+++ b/test/pyxtest/test_vidmode.py
@@ -5,7 +5,6 @@
 import struct
 
 import pytest
-
 from proto import vidmode
 from xclient import Extension, X11Error, X11Reply
 
diff --git a/test/pyxtest/test_xi.py b/test/pyxtest/test_xi.py
index dcfff83826..2a6a69010f 100644
--- a/test/pyxtest/test_xi.py
+++ b/test/pyxtest/test_xi.py
@@ -5,9 +5,8 @@
 import struct
 
 import pytest
-
 from proto import xi
-from xclient import BadLength, BadWindow, BadValue, Extension, X11Error, X11Reply
+from xclient import BadLength, BadValue, BadWindow, Extension, X11Error, X11Reply
 
 
 @pytest.fixture
diff --git a/test/pyxtest/test_xinerama.py b/test/pyxtest/test_xinerama.py
index cd5fea5719..6025e7b76b 100644
--- a/test/pyxtest/test_xinerama.py
+++ b/test/pyxtest/test_xinerama.py
@@ -3,7 +3,6 @@
 # Tests for XINERAMA (PanoramiX / pseudoramiX) extension.
 
 import pytest
-
 from proto import xinerama
 from xclient import Extension, X11Reply
 
diff --git a/test/pyxtest/test_xkb.py b/test/pyxtest/test_xkb.py
index 0faeaab16a..7121599715 100644
--- a/test/pyxtest/test_xkb.py
+++ b/test/pyxtest/test_xkb.py
@@ -7,7 +7,6 @@ import struct
 import time
 
 import pytest
-
 from proto import xkb
 from xclient import BadLength, BadMatch, BadValue, X11Error, X11Reply
 
diff --git a/test/pyxtest/test_xres.py b/test/pyxtest/test_xres.py
index a0f66b69ca..7f4788107a 100644
--- a/test/pyxtest/test_xres.py
+++ b/test/pyxtest/test_xres.py
@@ -5,7 +5,6 @@
 import struct
 
 import pytest
-
 from proto import xres
 from xclient import Extension, X11Reply
 
diff --git a/test/pyxtest/xclient.py b/test/pyxtest/xclient.py
index f75763c3f2..ff7e34d7d3 100644
--- a/test/pyxtest/xclient.py
+++ b/test/pyxtest/xclient.py
@@ -10,6 +10,7 @@ from dataclasses import dataclass
 from enum import StrEnum
 from typing import Protocol, runtime_checkable
 
+from proto import xkb
 from proto.bigrequests import BigRequestsEnableRequest
 from proto.x11 import (
     ChangeKeyboardMappingRequest,
@@ -18,7 +19,6 @@ from proto.x11 import (
     InternAtomRequest,
     QueryExtensionRequest,
 )
-from proto import xkb
 
 
 class X11ConnectionError(Exception):
diff --git a/test/pyxtest/xserver.py b/test/pyxtest/xserver.py
index 1a5e6ac0e7..257ae455b8 100644
--- a/test/pyxtest/xserver.py
+++ b/test/pyxtest/xserver.py
@@ -6,16 +6,15 @@
 # optionally under valgrind or with AddressSanitizer (ASAN) support,
 # with automatic display number allocation via the -displayfd mechanism.
 
-from typing import Iterator
-
 import os
 import select
 import shutil
-import sys
 import subprocess
+import sys
 import tempfile
 import time
 import warnings
+from collections.abc import Iterator
 from pathlib import Path
 
 from asan import AsanError