diff --git a/changelog.md b/changelog.md
index 55802f72..0a086618 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,7 @@ Upcoming (TBD)
 Bug Fixes
 ---------
 * Respect `history_file` setting in the `[main]` section of `~/.myclirc`.
+* Adapt test suite to pygments v2.20.0.
 
 
 1.72.1 (2026/05/11)
@@ -12,7 +13,6 @@ Bug Fixes
 Bug Fixes
 ---------
 * Update `sqlglot` to v30.7.0 to fix has_bit_strings error.
-* Adapt test suite to pygments 2.20.0
 
 
 1.72.0 (2026/05/08)
diff --git a/test/pytests/test_naive_completion.py b/test/pytests/test_naive_completion.py
index 46d46cde..fb7556d7 100644
--- a/test/pytests/test_naive_completion.py
+++ b/test/pytests/test_naive_completion.py
@@ -4,7 +4,7 @@
 from prompt_toolkit.document import Document
 import pytest
 
-from test.utils import pygments_at_least
+from test.utils import pygments_below
 
 
 @pytest.fixture
@@ -43,6 +43,7 @@ def test_function_name_completion(completer, complete_event):
         'MAKEDATE',
         'MAKETIME',
         'MAKE_SET',
+        'MANUAL',
         'MASTER',
         'MASTER_AUTO_POSITION',
         'MASTER_BIND',
@@ -82,10 +83,9 @@ def test_function_name_completion(completer, complete_event):
         'MAX_USER_CONNECTIONS',
     ]
 
-    if pygments_at_least("2.20"):
-        expected.extend([
-            'MANUAL',
-        ])
+    if pygments_below("2.20"):
+        expected.remove('MANUAL')
+
     assert sorted(x.text for x in result) == sorted(expected)
 
 
diff --git a/test/pytests/test_smart_completion_public_schema_only.py b/test/pytests/test_smart_completion_public_schema_only.py
index 09a20856..44a96741 100644
--- a/test/pytests/test_smart_completion_public_schema_only.py
+++ b/test/pytests/test_smart_completion_public_schema_only.py
@@ -8,7 +8,7 @@
 import pytest
 
 import mycli.packages.special.main as special
-from test.utils import pygments_at_least
+from test.utils import pygments_below
 
 metadata = {
     "users": ["id", "email", "first_name", "last_name"],
@@ -862,6 +862,7 @@ def test_backticked_column_completion_two_character(completer, complete_event):
         Completion(text='`fixed`', start_position=-2),
         Completion(text='`float`', start_position=-2),
         Completion(text='`fetch`', start_position=-2),
+        Completion(text='`files`', start_position=-2),
         Completion(text='`first`', start_position=-2),
         Completion(text='`flush`', start_position=-2),
         Completion(text='`force`', start_position=-2),
@@ -879,14 +880,19 @@ def test_backticked_column_completion_two_character(completer, complete_event):
         Completion(text='`fulltext`', start_position=-2),
         Completion(text='`function`', start_position=-2),
         Completion(text='`from_days`', start_position=-2),
+        Completion(text='`file_name`', start_position=-2),
         Completion(text='`following`', start_position=-2),
         Completion(text='`first_name`', start_position=-2),
         Completion(text='`found_rows`', start_position=-2),
         Completion(text='`find_in_set`', start_position=-2),
         Completion(text='`first_value`', start_position=-2),
         Completion(text='`from_base64`', start_position=-2),
+        Completion(text='`from_vector`', start_position=-2),
+        Completion(text='`file_format`', start_position=-2),
+        Completion(text='`file_prefix`', start_position=-2),
         Completion(text='`foreign key`', start_position=-2),
         Completion(text='`format_bytes`', start_position=-2),
+        Completion(text='`file_pattern`', start_position=-2),
         Completion(text='`from_unixtime`', start_position=-2),
         Completion(text='`file_block_size`', start_position=-2),
         Completion(text='`format_pico_time`', start_position=-2),
@@ -913,17 +919,18 @@ def test_backticked_column_completion_two_character(completer, complete_event):
         Completion(text='`references`', start_position=-2),
     ]
 
-    if pygments_at_least("2.20"):
-        expected.extend([
+    if pygments_below("2.20"):
+        for newer in [
             Completion(text='`file_format`', start_position=-2),
             Completion(text='`file_name`', start_position=-2),
             Completion(text='`file_pattern`', start_position=-2),
             Completion(text='`file_prefix`', start_position=-2),
             Completion(text='`files`', start_position=-2),
             Completion(text='`from_vector`', start_position=-2),
-        ])
+        ]:
+            expected.remove(newer)
 
-    assert sorted((x.text, x.start_position) for x in result) == sorted((x.text, x.start_position) for x in expected)
+    assert result == expected
 
 
 def test_backticked_column_completion_three_character(completer, complete_event):
@@ -935,13 +942,18 @@ def test_backticked_column_completion_three_character(completer, complete_event)
         Completion(text='`file`', start_position=-3),
         Completion(text='`field`', start_position=-3),
         Completion(text='`fixed`', start_position=-3),
+        Completion(text='`files`', start_position=-3),
         Completion(text='`first`', start_position=-3),
         Completion(text='`fields`', start_position=-3),
         Completion(text='`filter`', start_position=-3),
         Completion(text='`finish`', start_position=-3),
+        Completion(text='`file_name`', start_position=-3),
         Completion(text='`first_name`', start_position=-3),
         Completion(text='`find_in_set`', start_position=-3),
         Completion(text='`first_value`', start_position=-3),
+        Completion(text='`file_format`', start_position=-3),
+        Completion(text='`file_prefix`', start_position=-3),
+        Completion(text='`file_pattern`', start_position=-3),
         Completion(text='`file_block_size`', start_position=-3),
         Completion(text='`definer`', start_position=-3),
         Completion(text='`definition`', start_position=-3),
@@ -955,16 +967,17 @@ def test_backticked_column_completion_three_character(completer, complete_event)
         Completion(text='`foreign key`', start_position=-3),
     ]
 
-    if pygments_at_least("2.20"):
-        expected.extend([
-            Completion(text='`file_format`', start_position=-3),
+    if pygments_below("2.20"):
+        for newer in [
+            Completion(text='`files`', start_position=-3),
             Completion(text='`file_name`', start_position=-3),
+            Completion(text='`file_format`', start_position=-3),
             Completion(text='`file_pattern`', start_position=-3),
             Completion(text='`file_prefix`', start_position=-3),
-            Completion(text='`files`', start_position=-3),
-        ])
+        ]:
+            expected.remove(newer)
 
-    assert sorted((x.text, x.start_position) for x in result) == sorted((x.text, x.start_position) for x in expected)
+    assert result == expected
 
 
 def test_backticked_column_completion_four_character(completer, complete_event):
diff --git a/test/utils.py b/test/utils.py
index b92dd2f5..cc0f9702 100644
--- a/test/utils.py
+++ b/test/utils.py
@@ -39,8 +39,8 @@
 PYGMENTS_VERSION = Version(pygments.__version__)
 
 
-def pygments_at_least(version: str) -> bool:
-    return PYGMENTS_VERSION >= Version(version)
+def pygments_below(version: str) -> bool:
+    return PYGMENTS_VERSION < Version(version)
 
 
 class DummyLogger: