From be2a42f6f413cdbb7d2c125d2300ec28b8c0f861 Mon Sep 17 00:00:00 2001
From: crusaderky <crusaderky@gmail.com>
Date: Mon, 25 May 2026 23:58:10 +0100
Subject: [PATCH 1/2] Remove `avoid_ci` mark

---
 .github/workflows/tests.yaml             | 2 +-
 distributed/deploy/tests/test_old_ssh.py | 2 +-
 distributed/deploy/tests/test_ssh.py     | 3 +--
 distributed/tests/test_client.py         | 2 +-
 distributed/tests/test_stress.py         | 1 -
 pyproject.toml                           | 1 -
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 079729059fd..ce733be5537 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -239,7 +239,7 @@ jobs:
           mkdir reports
 
           python -m pytest distributed \
-            -m "not avoid_ci and ${{ matrix.partition }}" --runslow \
+            -m "${{ matrix.partition }}" --runslow \
             --leaks=fds,processes,threads \
             --junitxml reports/pytest.xml -o junit_suite_name=$TEST_ID \
             --cov=distributed --cov-report=xml \
diff --git a/distributed/deploy/tests/test_old_ssh.py b/distributed/deploy/tests/test_old_ssh.py
index de59ae8a359..c420d04fc02 100644
--- a/distributed/deploy/tests/test_old_ssh.py
+++ b/distributed/deploy/tests/test_old_ssh.py
@@ -17,7 +17,7 @@
 )
 
 
-@pytest.mark.avoid_ci
+@pytest.mark.skip
 def test_cluster(loop):
     with SSHCluster(
         scheduler_addr="127.0.0.1",
diff --git a/distributed/deploy/tests/test_ssh.py b/distributed/deploy/tests/test_ssh.py
index c14d6d9ef71..32bcb648186 100644
--- a/distributed/deploy/tests/test_ssh.py
+++ b/distributed/deploy/tests/test_ssh.py
@@ -105,7 +105,6 @@ async def test_keywords():
             assert all(v["nthreads"] == 2 for v in d.values())
 
 
-@pytest.mark.avoid_ci
 def test_defer_to_old(loop):
     with pytest.warns(
         UserWarning,
@@ -124,7 +123,7 @@ def test_defer_to_old(loop):
         assert isinstance(c, OldSSHCluster)
 
 
-@pytest.mark.avoid_ci
+@pytest.mark.skip
 def test_old_ssh_with_local_dir(loop):
     from distributed.deploy.old_ssh import SSHCluster as OldSSHCluster
 
diff --git a/distributed/tests/test_client.py b/distributed/tests/test_client.py
index 1f8f769f741..b46c67fec58 100644
--- a/distributed/tests/test_client.py
+++ b/distributed/tests/test_client.py
@@ -7950,7 +7950,7 @@ async def test_security_loader_import_failed(self):
                     pass
 
 
-@pytest.mark.avoid_ci(reason="This is slow and probably not worth the cost")
+@pytest.mark.skip(reason="This is very slow and probably not worth the cost")
 @pytest.mark.slow
 @gen_cluster(client=True)
 async def test_benchmark_hardware(c, s, a, b):
diff --git a/distributed/tests/test_stress.py b/distributed/tests/test_stress.py
index 565f3d97922..794fc530a47 100644
--- a/distributed/tests/test_stress.py
+++ b/distributed/tests/test_stress.py
@@ -175,7 +175,6 @@ def vsum(*args):
 
 
 @pytest.mark.skip(reason="times out")
-@pytest.mark.avoid_ci
 @pytest.mark.slow
 @gen_cluster(
     client=True,
diff --git a/pyproject.toml b/pyproject.toml
index bad74c7ede8..2f7a755b4aa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -181,7 +181,6 @@ markers = [
     "ci1: marks tests as belonging to 1 out of 2 partitions to run on CI ('-m \"not ci1\"' for second partition)",
     "memray: marks tests that require memray to run (available on Linux/MacOS only)",
     "slow: marks tests as slow (deselected by default; select with '--runslow')",
-    "avoid_ci: marks tests as flaky or broken on CI on all OSs",
     "ipython: marks tests as exercising IPython",
     "gpu: marks tests we want to run on GPUs",
     "leaking: ignore leaked resources",  # see pytest_resourceleaks.py for usage

From 28815ec8a3472c08d85d2b8f859a77ae1bd95eae Mon Sep 17 00:00:00 2001
From: crusaderky <crusaderky@gmail.com>
Date: Tue, 26 May 2026 08:58:48 +0100
Subject: [PATCH 2/2] xfail test_defer_to_old

---
 distributed/deploy/tests/test_ssh.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distributed/deploy/tests/test_ssh.py b/distributed/deploy/tests/test_ssh.py
index 32bcb648186..9852ba82144 100644
--- a/distributed/deploy/tests/test_ssh.py
+++ b/distributed/deploy/tests/test_ssh.py
@@ -105,6 +105,7 @@ async def test_keywords():
             assert all(v["nthreads"] == 2 for v in d.values())
 
 
+@pytest.mark.xfail(reason="Very flaky (leaks resources)", strict=False)
 def test_defer_to_old(loop):
     with pytest.warns(
         UserWarning,