diff --git a/src/gentropy/common/spark_helpers.py b/src/gentropy/common/spark_helpers.py
index 64a8bceb7..fd84a9810 100644
--- a/src/gentropy/common/spark_helpers.py
+++ b/src/gentropy/common/spark_helpers.py
@@ -4,9 +4,10 @@
 
 import re
 import sys
+from collections.abc import Callable, Iterable
 from functools import reduce, wraps
 from itertools import chain
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, Optional, TypeVar
 
 import pyspark.sql.functions as f
 import pyspark.sql.types as t
diff --git a/src/gentropy/method/l2g/feature_factory.py b/src/gentropy/method/l2g/feature_factory.py
index fe792058a..ca1ffb339 100644
--- a/src/gentropy/method/l2g/feature_factory.py
+++ b/src/gentropy/method/l2g/feature_factory.py
@@ -3,7 +3,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterator, Mapping
+from typing import Any
+from collections.abc import Iterator, Mapping
 
 from gentropy.dataset.l2g_features.colocalisation import (
     EQtlColocClppMaximumFeature,
diff --git a/tests/gentropy/datasource/finngen/test_finngen_study_index.py b/tests/gentropy/datasource/finngen/test_finngen_study_index.py
index 0d0537413..c85629a09 100644
--- a/tests/gentropy/datasource/finngen/test_finngen_study_index.py
+++ b/tests/gentropy/datasource/finngen/test_finngen_study_index.py
@@ -18,8 +18,8 @@
 from gentropy.finngen_studies import FinnGenStudiesStep
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
     from pathlib import Path
-    from typing import Callable
 
     from pyspark.sql import SparkSession
 
diff --git a/tests/gentropy/test_cli.py b/tests/gentropy/test_cli.py
index dbb5a8cac..aeac0c35c 100644
--- a/tests/gentropy/test_cli.py
+++ b/tests/gentropy/test_cli.py
@@ -14,15 +14,19 @@ def test_main_no_step() -> None:
     override_key = "step"
     expected = f"You must specify '{override_key}', e.g, {override_key}=<OPTION>\nAvailable options:"
 
-    with patch("sys.argv", ["cli.py"]), pytest.raises(
-        ConfigCompositionException, match=expected
+    with (
+        patch("sys.argv", ["cli.py"]),
+        pytest.raises(ConfigCompositionException, match=expected),
     ):
         main()
 
 
 def test_main_step() -> None:
     """Test the main function of the CLI complains about mandatory values."""
-    with patch("sys.argv", ["cli.py", "step=gene_index"]), pytest.raises(
-        MissingMandatoryValue, match="Missing mandatory value: step.target_path"
+    with (
+        patch("sys.argv", ["cli.py", "step=gene_index"]),
+        pytest.raises(
+            MissingMandatoryValue, match="Missing mandatory value: step.target_path"
+        ),
     ):
         main()