diff --git a/environment.yml b/environment.yml
index 954a5adf78c..02fef4f9226 100644
--- a/environment.yml
+++ b/environment.yml
@@ -63,11 +63,11 @@ dependencies:
   - pytest >=3.6
   - pytest-cov >=2.2.0
   - pytest-mock
+  - pytest-rerunfailures
   - setuptools-scm
   - shellcheck
   - typer
   - typer-cli
-  - flaky
   # docs
   - pygments >=1.5
   - sphinx
diff --git a/setup.cfg b/setup.cfg
index b1e6b8a7103..539bac496c5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -85,13 +85,13 @@ server =
     tornado-m2crypto
     importlib_resources
 testing =
-    flaky
     hypothesis
     mock
     parameterized
     pytest
     pytest-cov
     pytest-mock
+    pytest-rerunfailures
     pycodestyle
 
 [options.entry_points]
diff --git a/src/DIRAC/Core/Utilities/test/Test_Profiler.py b/src/DIRAC/Core/Utilities/test/Test_Profiler.py
index 9e8a2f90612..aea819e70e4 100644
--- a/src/DIRAC/Core/Utilities/test/Test_Profiler.py
+++ b/src/DIRAC/Core/Utilities/test/Test_Profiler.py
@@ -5,7 +5,6 @@
 from subprocess import Popen
 
 import pytest
-from flaky import flaky
 
 import DIRAC
 from DIRAC.Core.Utilities.Profiler import Profiler
@@ -78,7 +77,7 @@ def test_base():
     assert resWC["Value"] >= res["Value"]
 
 
-@flaky(max_runs=10, min_passes=2)
+@pytest.mark.flaky(reruns=10)
 def test_cpuUsage():
     mainProcess = Popen(
         [
diff --git a/src/DIRAC/FrameworkSystem/private/standardLogging/test/Test_Logging_GetSubLogger.py b/src/DIRAC/FrameworkSystem/private/standardLogging/test/Test_Logging_GetSubLogger.py
index 02f39620aa1..30bd6a4959d 100644
--- a/src/DIRAC/FrameworkSystem/private/standardLogging/test/Test_Logging_GetSubLogger.py
+++ b/src/DIRAC/FrameworkSystem/private/standardLogging/test/Test_Logging_GetSubLogger.py
@@ -2,7 +2,6 @@
 Test SubLogger
 """
 import pytest
-from flaky import flaky
 from DIRAC.FrameworkSystem.private.standardLogging.LogLevels import LogLevels
 
 
@@ -52,7 +51,7 @@ def test_getSubLoggerObject():
 # Run the tests for all the log levels and exceptions
 # We may need to rerun the test if we are unlucky and the timestamps
 # don't match
-@flaky(max_runs=3)
+@pytest.mark.flaky(reruns=3)
 @pytest.mark.parametrize("logLevel", ["exception"] + [lvl.lower() for lvl in LogLevels.getLevelNames()])
 def test_localSubLoggerObject(logLevel):
     """