diff --git a/test/cql-pytest/run.py b/test/cql-pytest/run.py
index 2e342c372e..3d7d5f9720 100755
--- a/test/cql-pytest/run.py
+++ b/test/cql-pytest/run.py
@@ -321,6 +321,7 @@ def run_scylla_cmd(pid, dir):
         '--permissions-update-interval-in-ms', '100',
         '--permissions-validity-in-ms', '100',
         '--shutdown-announce-in-ms', '0',
+        '--maintenance-socket', 'workdir',
         ], env)
 
 # Same as run_scylla_cmd, just use SSL encryption for the CQL port (same
diff --git a/test/pylib/scylla_cluster.py b/test/pylib/scylla_cluster.py
index a9be62ecc5..9be2a76a57 100644
--- a/test/pylib/scylla_cluster.py
+++ b/test/pylib/scylla_cluster.py
@@ -110,6 +110,8 @@ def make_scylla_conf(workdir: pathlib.Path, host_addr: str, seed_addrs: List[str
 
         'reader_concurrency_semaphore_serialize_limit_multiplier': 0,
         'reader_concurrency_semaphore_kill_limit_multiplier': 0,
+
+        'maintenance_socket': 'workdir',
     }
 
 # Seastar options can not be passed through scylla.yaml, use command line