diff --git a/pyproject.toml b/pyproject.toml
index 553433964..df8c4048e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -82,6 +82,7 @@ task-tags = ["TODO", "FIXME", "XXX"]
 #   TID251: ban certain APIs
 # TD: enforce TODO comment style
 #   disabled TD001: allow FIXME and XXX comments
+#   disabled TD002: author names on todos may be good, but simple fixmes dont need them
 #   disabled TD003: todos don't require an explicit issue link for us
 # ARG: disallow unused arguments
 # PTH: use pathlib instead of os calls
@@ -141,7 +142,7 @@ task-tags = ["TODO", "FIXME", "XXX"]
 # TRY: try and raise related things, not helpful as we only do testing
 # T20: Scripts usually output to stdout as either they are directly cli or passed into files
 select = ["E4", "E7", "E9", "F", "ERA", "ASYNC", "ANN0", "ANN2", "A", "C4", "ISC", "INP", "LOG", "G", "PIE", "PT", "Q", "RSE", "RET", "SIM", "TID251", "TD", "ARG", "PTH", "N", "PERF", "PLC", "PLE", "UP", "RUF"]
-ignore = ["ANN002", "ANN003", "TD001", "TD003", "PLE1", "RUF005", "RUF003"]
+ignore = ["ANN002", "ANN003", "TD001", "TD002", "TD003", "PLE1", "RUF005", "RUF003"]
 
 [tool.ruff.format]
 indent-style = "space"
diff --git a/tests/functional2/build/test_build_jobless.py b/tests/functional2/build/test_build_jobless.py
index 4a7d713dc..0f52f3d7b 100644
--- a/tests/functional2/build/test_build_jobless.py
+++ b/tests/functional2/build/test_build_jobless.py
@@ -38,6 +38,7 @@ def test_j0_without_remotes_fails(nix: Nix):
     )
 
 
+@pytest.mark.no_daemon
 def test_j0_with_mismatched_remotes_fails(nix: Nix):
     remote = f"ssh://localhost?remote-store={nix.env.dirs.home}/machine1"
     result = nix.nix_build(["-j0", "--expr", drv, "--builders", remote]).run().expect(1)
@@ -47,6 +48,7 @@ def test_j0_with_mismatched_remotes_fails(nix: Nix):
     )
 
 
+@pytest.mark.no_daemon
 @with_files({"config.nix": get_global_asset("config.nix"), "default.nix": File(local_drv)})
 def test_j0_without_local_jobs(nix: Nix):
     result = nix.nix_build(["-j0", "--extra-local-jobs", "0"]).run().expect(1)
diff --git a/tests/functional2/build/test_ca.py b/tests/functional2/build/test_ca.py
index b0162c4f9..8d7177c45 100644
--- a/tests/functional2/build/test_ca.py
+++ b/tests/functional2/build/test_ca.py
@@ -12,6 +12,9 @@ from typing import Literal
 
 from dataclasses import dataclass
 
+# FIXME: might be fixable by passing cert options to the daemon
+pytestmark = pytest.mark.no_daemon
+
 
 @dataclass
 class CertAssessment:
diff --git a/tests/functional2/build/test_fixed.py b/tests/functional2/build/test_fixed.py
index be627edf4..70ae7f101 100644
--- a/tests/functional2/build/test_fixed.py
+++ b/tests/functional2/build/test_fixed.py
@@ -28,7 +28,11 @@ def test_bad(nix: Nix):
 
     # Building with the bad hash should produce the "good" output path as
     # a sideeffect.
-    res = nix.nix_build(["fixed.nix", "-A", "bad", "--no-out-link"]).run().expect(102)
+    res = (
+        nix.nix_build(["fixed.nix", "-A", "bad", "--no-out-link"])
+        .run()
+        .expect(102 if not nix.uses_daemon else 1)
+    )
     assert "hash mismatch in fixed-output derivation" in res.stderr_plain
     assert path.exists()
 
@@ -80,7 +84,11 @@ def test_illegal_references(nix: Nix):
     - *-darwin has a different store location on the top of this in the sandbox (/private/tmp/...) causing further changes.
     Regex matching is the best we can afford.
     """
-    res = nix.nix_build(["fixed.nix", "-A", "illegalReferences"]).run().expect(102)
+    res = (
+        nix.nix_build(["fixed.nix", "-A", "illegalReferences"])
+        .run()
+        .expect(102 if not nix.uses_daemon else 1)
+    )
     assert re.findall(
         r"the fixed-output derivation '.*?/nix/store/[a-z0-9]*-illegal-reference.drv' must not reference store paths but 1 such references were found:.*/nix/store/[a-z0-9]*-fixed",
         res.stderr_plain,
diff --git a/tests/functional2/build/test_import_from_derivation.py b/tests/functional2/build/test_import_from_derivation.py
index 298f6a480..4f3b1700a 100644
--- a/tests/functional2/build/test_import_from_derivation.py
+++ b/tests/functional2/build/test_import_from_derivation.py
@@ -8,11 +8,16 @@ from testlib.utils import get_global_asset
 import re
 
 
-def filter_paths(nix: Nix, output: str) -> str:
+def filter_output(nix: Nix, output: str) -> str:
+    # Replace store hashes with something fixed, and also strip all daemon warnings about untrusted user settings
     return re.sub(
-        r"/nix/store/[0-9a-z]{32}",
-        "/nix/store/hashfilteredforrepeatableoutputs",
-        output.replace(nix.env.dirs.test_root.as_posix(), ""),
+        r"(?m)^warning:.*trusted user.*\n?",
+        "",
+        re.sub(
+            r"/nix/store/[0-9a-z]{32}",
+            "/nix/store/hashfilteredforrepeatableoutputs",
+            output.replace(nix.env.dirs.test_root.as_posix(), ""),
+        ),
     )
 
 
@@ -39,7 +44,7 @@ def test_warn_ifd(nix: Nix, snapshot: Callable[[str], Snapshot]):
         .stderr_plain
     )
 
-    assert snapshot("error") == filter_paths(nix, error)
+    assert snapshot("error") == filter_output(nix, error)
 
 
 @with_files(
@@ -64,7 +69,7 @@ def test_deny_ifd(nix: Nix, snapshot: Callable[[str], Snapshot]):
         .expect(1)
         .stderr_plain
     )
-    assert snapshot("error") == filter_paths(nix, error)
+    assert snapshot("error") == filter_output(nix, error)
 
 
 @with_files(
@@ -82,7 +87,7 @@ def test_allow_ifd(nix: Nix, snapshot: Callable[[str], Snapshot]):
     out_path = build.stdout_plain
 
     assert nix.physical_store_path_for(out_path).read_text() == "FOO579"
-    assert snapshot("error") == filter_paths(nix, error)
+    assert snapshot("error") == filter_output(nix, error)
 
 
 @with_files(
@@ -103,4 +108,4 @@ def test_instantiate_ifd_readonly_fail(nix: Nix, snapshot: Callable[[str], Snaps
         .expect(1)
         .stderr_plain
     )
-    assert snapshot("error") == filter_paths(nix, error)
+    assert snapshot("error") == filter_output(nix, error)
diff --git a/tests/functional2/build/test_remote.py b/tests/functional2/build/test_remote.py
index b28c2e854..c58825a11 100644
--- a/tests/functional2/build/test_remote.py
+++ b/tests/functional2/build/test_remote.py
@@ -56,6 +56,7 @@ def _builders(proto: str, flags: list[str], env: ManagedEnv) -> str:
     """)
 
 
+@pytest.mark.no_daemon
 @pytest.mark.full_sandbox
 @with_files(
     {
@@ -98,6 +99,7 @@ def test_remote_trustless_unsigned(nix: Nix, env: ManagedEnv, busybox_args: list
     )
 
 
+@pytest.mark.no_daemon
 @pytest.mark.full_sandbox
 @pytest.mark.parametrize(
     ("protocol", "flags"), [("ssh", []), ("ssh-ng", []), ("ssh-ng", ["--force-untrusted"])]
@@ -127,6 +129,7 @@ def test_remote_trustless_ia(
     assert nix.physical_store_path_for(out_path).read_text() == "FOO BAR BAZ\n"
 
 
+@pytest.mark.no_daemon
 @pytest.mark.full_sandbox
 @pytest.mark.parametrize(("protocol", "flags"), [("ssh", []), ("ssh-ng", ["--force-untrusted"])])
 @with_files(
diff --git a/tests/functional2/build/test_substitution.py b/tests/functional2/build/test_substitution.py
index 7ad24e7e1..8131b0ed4 100644
--- a/tests/functional2/build/test_substitution.py
+++ b/tests/functional2/build/test_substitution.py
@@ -51,18 +51,21 @@ def test_substitution_fallback_good_first(nix: Nix, caches: Caches):
     build(nix, "--substituters", f"{caches.good} {caches.bad}").ok()
 
 
+@pytest.mark.no_daemon
 def test_substitution_fallback_bad_first(nix: Nix, caches: Caches):
     # we expect three warnings for the single nar: two from querying, one from the substitution itself
     result = build(nix, "--substituters", f"{caches.bad} {caches.good}").ok()
     assert len(re.findall(r"warning.*narinfo", result.stderr_s)) == 3
 
 
+@pytest.mark.no_daemon
 def test_substitution_fallback_may_build(nix: Nix, caches: Caches):
     # we expect two errors for the single nar: one from querying, one from the substitution itself
     result = build(nix, "--substituters", f"{caches.bad}", "--fallback").ok()
     assert len(re.findall(r"error.*narinfo", result.stderr_s)) == 2
 
 
+@pytest.mark.no_daemon
 def test_substitution_fallback_no_build(nix: Nix, caches: Caches):
     # we expect one error, and it's fatal
     result = build(nix, "--substituters", f"{caches.bad}").expect(1)
diff --git a/tests/functional2/cli/test_daemon.py b/tests/functional2/cli/test_daemon.py
index d9bbedd75..173da57bd 100644
--- a/tests/functional2/cli/test_daemon.py
+++ b/tests/functional2/cli/test_daemon.py
@@ -2,6 +2,9 @@ from pathlib import Path
 from testlib.fixtures.nix import Nix
 from testlib.fixtures.file_helper import with_files
 from testlib.utils import get_global_asset_pack
+import pytest
+
+pytestmark = pytest.mark.no_daemon
 
 
 @with_files(get_global_asset_pack("simple-drv"))
diff --git a/tests/functional2/cli/test_store_ping.py b/tests/functional2/cli/test_store_ping.py
index fedf5b331..6c9ac2c6e 100644
--- a/tests/functional2/cli/test_store_ping.py
+++ b/tests/functional2/cli/test_store_ping.py
@@ -1,6 +1,8 @@
 import pytest
 from testlib.fixtures.nix import Nix, NixDaemon
 
+pytestmark = pytest.mark.no_daemon
+
 
 @pytest.fixture(autouse=True)
 def setup(nix: Nix):
diff --git a/tests/functional2/commands/test_build/test_build_fod.py b/tests/functional2/commands/test_build/test_build_fod.py
index c25bf28cd..8c20b3243 100644
--- a/tests/functional2/commands/test_build/test_build_fod.py
+++ b/tests/functional2/commands/test_build/test_build_fod.py
@@ -15,7 +15,11 @@ _build_args = ["build", "-f", "fod-failing.nix", "-L"]
 
 @with_files(_fod_files)
 def test_url_mismatch(nix: Nix):
-    res = nix.nix_build(["fod-failing.nix", "-A", "x1"]).run().expect(102)
+    res = (
+        nix.nix_build(["fod-failing.nix", "-A", "x1"])
+        .run()
+        .expect(102 if not nix.uses_daemon else 1)
+    )
     err = res.stderr_plain
     assert len(re.findall(r"hash mismatch in fixed-output derivation '.*-x1\.drv'", err)) == 1
     assert "likely URL: https://meow.puppy.forge/puppy.tar.gz" in err
diff --git a/tests/functional2/commands/test_build/test_timeout.py b/tests/functional2/commands/test_build/test_timeout.py
index a7684d209..30f701c44 100644
--- a/tests/functional2/commands/test_build/test_timeout.py
+++ b/tests/functional2/commands/test_build/test_timeout.py
@@ -1,6 +1,7 @@
 from testlib.fixtures.file_helper import with_files, CopyFile
 from testlib.fixtures.nix import Nix
 from testlib.utils import get_global_asset
+import pytest
 
 _files = {
     "timeout.nix": CopyFile("assets/test_timeout/timeout.nix"),
@@ -13,11 +14,12 @@ def test_timeout_timeout(nix: Nix):
     res = (
         nix.nix_build(["-Q", "timeout.nix", "-A", "infiniteLoop", "--timeout", "2"])
         .run()
-        .expect(101)
+        .expect(101 if not nix.uses_daemon else 1)
     )
     assert "timed out" in res.stderr_plain
 
 
+@pytest.mark.no_daemon
 @with_files(_files)
 def test_timeout_max_log(nix: Nix):
     res = (
@@ -30,13 +32,21 @@ def test_timeout_max_log(nix: Nix):
 
 @with_files(_files)
 def test_timeout_silent(nix: Nix):
-    res = nix.nix_build(["timeout.nix", "-A", "silent", "--max-silent-time", "2"]).run().expect(101)
+    res = (
+        nix.nix_build(["timeout.nix", "-A", "silent", "--max-silent-time", "2"])
+        .run()
+        .expect(101 if not nix.uses_daemon else 1)
+    )
     assert "file timed out after 2 seconds of silence" in res.stderr_plain
 
 
 @with_files(_files)
 def test_timeout_close_log(nix: Nix):
-    res = nix.nix_build(["timeout.nix", "-A", "closeLog"]).run().expect(100)
+    res = (
+        nix.nix_build(["timeout.nix", "-A", "closeLog"])
+        .run()
+        .expect(100 if not nix.uses_daemon else 1)
+    )
     assert "failed due to signal 9 (Killed" in res.stderr_plain
 
 
diff --git a/tests/functional2/daemon/test_connect.py b/tests/functional2/daemon/test_connect.py
index 7ed6fdc39..c96bd8cff 100644
--- a/tests/functional2/daemon/test_connect.py
+++ b/tests/functional2/daemon/test_connect.py
@@ -3,6 +3,8 @@ import itertools
 
 from testlib.fixtures.nix import Nix
 
+pytestmark = pytest.mark.no_daemon
+
 
 @pytest.fixture(autouse=True)
 def setup(nix: Nix):
diff --git a/tests/functional2/eval/test_eval_store.py b/tests/functional2/eval/test_eval_store.py
index 8ab4cd47e..63340f113 100644
--- a/tests/functional2/eval/test_eval_store.py
+++ b/tests/functional2/eval/test_eval_store.py
@@ -5,6 +5,7 @@ from pathlib import Path
 from testlib.fixtures.file_helper import with_files
 from testlib.utils import get_global_asset_pack
 from testlib.fixtures.nix import Nix
+import pytest
 
 
 def assert_only_scratch_drvs(env: ManagedEnv):
@@ -12,6 +13,7 @@ def assert_only_scratch_drvs(env: ManagedEnv):
     assert list((env.dirs.home / "eval_store" / "nix" / "store").glob("*.drv"))
 
 
+@pytest.mark.no_daemon
 @with_files(get_global_asset_pack("dependencies"))
 def test_nix3_build(nix: Nix, files: Path):
     eval_store = files / "eval_store"
@@ -31,6 +33,7 @@ def test_nix_instantiate(nix: Nix, files: Path):
     assert_only_scratch_drvs(nix.env)
 
 
+@pytest.mark.no_daemon
 @with_files(get_global_asset_pack("dependencies"))
 def test_nix_build(nix: Nix, files: Path):
     res_link = files / "result"
diff --git a/tests/functional2/eval/test_fetch_mercurial.py b/tests/functional2/eval/test_fetch_mercurial.py
index d48898b4a..81801cdc7 100644
--- a/tests/functional2/eval/test_fetch_mercurial.py
+++ b/tests/functional2/eval/test_fetch_mercurial.py
@@ -13,9 +13,10 @@ from testlib.fixtures.command import Command
 
 
 @pytest.fixture(autouse=True)
-def common_init(nix: Nix):
+def common_init(nix: Nix, env: ManagedEnv):
     nix.settings.add_xp_feature("nix-command")
     nix.env.path.add_program("hg")
+    env.path.add_program("hg")
 
 
 @dataclass
diff --git a/tests/functional2/eval/test_nix_path.py b/tests/functional2/eval/test_nix_path.py
index 8af81d047..603f0f7b9 100644
--- a/tests/functional2/eval/test_nix_path.py
+++ b/tests/functional2/eval/test_nix_path.py
@@ -5,6 +5,8 @@ from testlib.fixtures.file_helper import with_files
 from testlib.fixtures.nix import Nix
 from testlib.utils import get_global_asset
 
+pytestmark = pytest.mark.no_daemon
+
 
 @with_files({"trivial.nix": get_global_asset("trivial.nix")})
 @pytest.mark.parametrize("prefix", ["by-absolute-path", "by-relative-path"])
diff --git a/tests/functional2/flakes/test_absolute_paths.py b/tests/functional2/flakes/test_absolute_paths.py
index 34cbc2b49..f28da952c 100644
--- a/tests/functional2/flakes/test_absolute_paths.py
+++ b/tests/functional2/flakes/test_absolute_paths.py
@@ -3,6 +3,9 @@ from testlib.fixtures.git import Git
 from testlib.fixtures.file_helper import with_files, File
 from testlib.utils import get_global_asset_pack
 from pathlib import Path
+import pytest
+
+pytestmark = pytest.mark.no_daemon
 
 
 @with_files({"flake1": get_global_asset_pack(".git"), "input": File("input")})
diff --git a/tests/functional2/flakes/test_circular.py b/tests/functional2/flakes/test_circular.py
index af5b358e5..9fd234aad 100644
--- a/tests/functional2/flakes/test_circular.py
+++ b/tests/functional2/flakes/test_circular.py
@@ -4,6 +4,10 @@ from testlib.fixtures.file_helper import with_files, File
 from testlib.utils import get_global_asset_pack
 from pathlib import Path
 
+import pytest
+
+pytestmark = pytest.mark.no_daemon
+
 
 @with_files(
     {
diff --git a/tests/functional2/flakes/test_cli.py b/tests/functional2/flakes/test_cli.py
index f44dea209..5c1a4eeb8 100644
--- a/tests/functional2/flakes/test_cli.py
+++ b/tests/functional2/flakes/test_cli.py
@@ -15,6 +15,8 @@ from testlib.fixtures.file_helper import with_files, File, FileDeclaration, _ini
 from testlib.environ import environ
 from .common import simple_flake, dependent_flake
 
+pytestmark = pytest.mark.no_daemon
+
 system = environ.get("system")
 
 
diff --git a/tests/functional2/flakes/test_config.py b/tests/functional2/flakes/test_config.py
index 386057684..2a2bd0b3b 100644
--- a/tests/functional2/flakes/test_config.py
+++ b/tests/functional2/flakes/test_config.py
@@ -6,6 +6,8 @@ from pathlib import Path
 from textwrap import dedent
 import pytest
 
+pytestmark = pytest.mark.no_daemon
+
 system = environ.get("system")
 
 files = get_global_asset_pack("simple-drv") | {
diff --git a/tests/functional2/flakes/test_develop.py b/tests/functional2/flakes/test_develop.py
index a31c47e52..61d7e1936 100644
--- a/tests/functional2/flakes/test_develop.py
+++ b/tests/functional2/flakes/test_develop.py
@@ -6,6 +6,8 @@ from testlib.utils import get_global_asset, get_global_asset_pack
 from pathlib import Path
 import pytest
 
+pytestmark = pytest.mark.no_daemon
+
 system = environ.get("system")
 
 flake = {
diff --git a/tests/functional2/flakes/test_flake_in_submodule.py b/tests/functional2/flakes/test_flake_in_submodule.py
index 26a79e7e5..444b5d3e4 100644
--- a/tests/functional2/flakes/test_flake_in_submodule.py
+++ b/tests/functional2/flakes/test_flake_in_submodule.py
@@ -16,10 +16,12 @@ from testlib.fixtures.git import Git
 from testlib.fixtures.file_helper import with_files, File, EnvTemplate
 from testlib.utils import get_global_asset_pack
 from pathlib import Path
-import pytest
 import re
 import json
 import shutil
+import pytest
+
+pytestmark = pytest.mark.no_daemon
 
 root_without_self = get_global_asset_pack(".git") | {"root.nix": File('"expression in root repo"')}
 
diff --git a/tests/functional2/flakes/test_follow_paths.py b/tests/functional2/flakes/test_follow_paths.py
index 5e67c8f7f..5bc516680 100644
--- a/tests/functional2/flakes/test_follow_paths.py
+++ b/tests/functional2/flakes/test_follow_paths.py
@@ -7,6 +7,8 @@ import pytest
 import fnmatch
 import json
 
+pytestmark = pytest.mark.no_daemon
+
 
 @pytest.fixture(autouse=True)
 def add_xp_features(nix: Nix):
diff --git a/tests/functional2/flakes/test_init.py b/tests/functional2/flakes/test_init.py
index 63daf3dea..b6f0c776c 100644
--- a/tests/functional2/flakes/test_init.py
+++ b/tests/functional2/flakes/test_init.py
@@ -6,6 +6,8 @@ from testlib.utils import get_global_asset_pack, get_global_asset
 from pathlib import Path
 import pytest
 
+pytestmark = pytest.mark.no_daemon
+
 system = environ.get("system")
 
 files = {
diff --git a/tests/functional2/flakes/test_inputs.py b/tests/functional2/flakes/test_inputs.py
index 198d54333..cd2bb84eb 100644
--- a/tests/functional2/flakes/test_inputs.py
+++ b/tests/functional2/flakes/test_inputs.py
@@ -7,6 +7,8 @@ from pathlib import Path
 from .common import simple_flake
 import pytest
 
+pytestmark = pytest.mark.no_daemon
+
 system = environ.get("system")
 files = simple_flake() | {
     "b-low": simple_flake()
diff --git a/tests/functional2/flakes/test_mercurial.py b/tests/functional2/flakes/test_mercurial.py
index f03ba131b..1b999b050 100644
--- a/tests/functional2/flakes/test_mercurial.py
+++ b/tests/functional2/flakes/test_mercurial.py
@@ -9,6 +9,8 @@ from .common import simple_flake, dependent_flake
 from collections.abc import Callable
 import glob
 
+pytestmark = pytest.mark.no_daemon
+
 system = environ.get("system")
 
 files = {"flake-hg1": simple_flake(), "flake-hg2": dependent_flake()}
diff --git a/tests/functional2/flakes/test_subdir_flake.py b/tests/functional2/flakes/test_subdir_flake.py
index a2b40f601..1df4baa52 100644
--- a/tests/functional2/flakes/test_subdir_flake.py
+++ b/tests/functional2/flakes/test_subdir_flake.py
@@ -6,6 +6,10 @@ from testlib.utils import get_global_asset_pack
 from pathlib import Path
 from .common import simple_flake
 
+import pytest
+
+pytestmark = pytest.mark.no_daemon
+
 
 @with_files({"flake-container": get_global_asset_pack(".git") | {"flake-dir": simple_flake()}})
 def test_subdir_flake(nix: Nix, files: Path, git: Git):
diff --git a/tests/functional2/flakes/test_symlink_paths.py b/tests/functional2/flakes/test_symlink_paths.py
index 83fa8ca24..d1b340077 100644
--- a/tests/functional2/flakes/test_symlink_paths.py
+++ b/tests/functional2/flakes/test_symlink_paths.py
@@ -5,6 +5,10 @@ from testlib.fixtures.file_helper import CopyFile, Symlink, with_files, File
 from testlib.utils import get_global_asset_pack
 from testlib.fixtures.git import Git
 
+import pytest
+
+pytestmark = pytest.mark.no_daemon
+
 
 @with_files(
     {"flake1": {"flake.nix": CopyFile("assets/flake1.nix")}, "flake1_sym": Symlink("flake1")}
diff --git a/tests/functional2/flakes/test_unlocked_override.py b/tests/functional2/flakes/test_unlocked_override.py
index 71d8006c2..96d7952b7 100644
--- a/tests/functional2/flakes/test_unlocked_override.py
+++ b/tests/functional2/flakes/test_unlocked_override.py
@@ -4,6 +4,10 @@ from testlib.fixtures.file_helper import with_files, File
 from testlib.utils import get_global_asset_pack
 from pathlib import Path
 
+import pytest
+
+pytestmark = pytest.mark.no_daemon
+
 
 @with_files(
     {
diff --git a/tests/functional2/store/cache/test_cache_compressions.py b/tests/functional2/store/cache/test_cache_compressions.py
index ba1d2edee..3288dd81c 100644
--- a/tests/functional2/store/cache/test_cache_compressions.py
+++ b/tests/functional2/store/cache/test_cache_compressions.py
@@ -5,6 +5,8 @@ from testlib.fixtures.nix import Nix
 from testlib.utils import get_global_asset_pack
 
 
+# FIXME: clear_store breaks daemons
+@pytest.mark.no_daemon
 @with_files(get_global_asset_pack("dependencies"))
 @pytest.mark.parametrize("algorithm", ["br", "zstd", "xz"])
 def test_cache_compressions(nix: Nix, algorithm: str):
diff --git a/tests/functional2/store/cache/test_substitute_truncated_nar.py b/tests/functional2/store/cache/test_substitute_truncated_nar.py
index 16354626b..73b6994d6 100644
--- a/tests/functional2/store/cache/test_substitute_truncated_nar.py
+++ b/tests/functional2/store/cache/test_substitute_truncated_nar.py
@@ -1,8 +1,11 @@
 from textwrap import dedent
 
 from testlib.fixtures.nix import Nix
+import pytest
 
 
+# FIXME: clear_store breaks daemons
+@pytest.mark.no_daemon
 def test_substitute_truncated_nar(nix: Nix):
     drv = dedent("""
         derivation {
diff --git a/tests/functional2/store/test_build.py b/tests/functional2/store/test_build.py
index 9ccce5409..7a6c1f4fe 100644
--- a/tests/functional2/store/test_build.py
+++ b/tests/functional2/store/test_build.py
@@ -6,6 +6,10 @@ from testlib.fixtures.file_helper import with_files
 from testlib.fixtures.nix import Nix
 from testlib.utils import get_global_asset
 
+import pytest
+
+pytestmark = pytest.mark.no_daemon
+
 
 @with_files({"config.nix": get_global_asset("config.nix")})
 def test_build_dir_permissions(nix: Nix):
diff --git a/tests/functional2/store/test_dump_db.py b/tests/functional2/store/test_dump_db.py
index cc44504dc..bec1096ed 100644
--- a/tests/functional2/store/test_dump_db.py
+++ b/tests/functional2/store/test_dump_db.py
@@ -4,6 +4,10 @@ from testlib.fixtures.file_helper import with_files
 from testlib.fixtures.nix import Nix
 from testlib.utils import get_global_asset_pack
 
+import pytest
+
+pytestmark = pytest.mark.no_daemon
+
 
 @with_files(get_global_asset_pack("dependencies"))
 def test_dump_db(nix: Nix):
diff --git a/tests/functional2/store/test_evil_nars.py b/tests/functional2/store/test_evil_nars.py
index 0a4984522..460165288 100644
--- a/tests/functional2/store/test_evil_nars.py
+++ b/tests/functional2/store/test_evil_nars.py
@@ -16,6 +16,8 @@ from testlib.nar import (
     write_with_export_header,
 )
 
+pytestmark = pytest.mark.no_daemon
+
 meow_orig = "méow"
 meow_nfc_ = unicodedata.normalize("NFC", meow_orig)
 meow_nfd_ = unicodedata.normalize("NFD", meow_orig)
diff --git a/tests/functional2/store/test_export.py b/tests/functional2/store/test_export.py
index 327206bc7..5539be3ab 100644
--- a/tests/functional2/store/test_export.py
+++ b/tests/functional2/store/test_export.py
@@ -3,6 +3,10 @@ from testlib.fixtures.command import Command
 from testlib.fixtures.file_helper import with_files
 from testlib.utils import get_global_asset_pack
 from testlib.fixtures.nix import Nix
+import pytest
+
+# FIXME: clear_store breaks daemons
+pytestmark = pytest.mark.no_daemon
 
 
 @with_files(get_global_asset_pack("dependencies"))
diff --git a/tests/functional2/store/test_http.py b/tests/functional2/store/test_http.py
index d88d50478..75ccc815b 100644
--- a/tests/functional2/store/test_http.py
+++ b/tests/functional2/store/test_http.py
@@ -8,6 +8,8 @@ from testlib.fixtures.file_helper import File, with_files
 from testlib.fixtures.http_server import http_server
 from testlib.fixtures.nix import Nix, with_diverted_store
 
+pytestmark = pytest.mark.no_daemon
+
 
 class HTTPStore:
     def __init__(self):
diff --git a/tests/functional2/store/test_optimise_store.py b/tests/functional2/store/test_optimise_store.py
index 8f909c261..7d156a5c4 100644
--- a/tests/functional2/store/test_optimise_store.py
+++ b/tests/functional2/store/test_optimise_store.py
@@ -4,6 +4,10 @@ from testlib.fixtures.file_helper import with_files
 from testlib.fixtures.nix import Nix, NixDaemon
 from testlib.utils import get_global_asset
 
+import pytest
+
+pytestmark = pytest.mark.no_daemon
+
 
 @with_files({"config.nix": get_global_asset("config.nix")})
 class TestOptimizeStore:
diff --git a/tests/functional2/testlib/fixtures/env.py b/tests/functional2/testlib/fixtures/env.py
index 4a80023fe..5dec1603b 100644
--- a/tests/functional2/testlib/fixtures/env.py
+++ b/tests/functional2/testlib/fixtures/env.py
@@ -215,6 +215,8 @@ class ManagedEnv:
             # when writing things to the terminal (esp with man pages) use cat, to print the full output to stdout
             "PAGER": "cat",
             "BUILD_TEST_SHELL": self.shell_dir,
+            # asan can't print to stdio because that breaks snapshot tests
+            "ASAN_OPTIONS": f"log_path={self._tmp_path}/asan.log:{environ.get('ASAN_OPTIONS', '')}",
         }
         if self.build_env:
             self._env["BUILD_TEST_ENV"] = self.build_env
diff --git a/tests/functional2/testlib/fixtures/nix.py b/tests/functional2/testlib/fixtures/nix.py
index 5e33606f4..1dfbbb9f5 100644
--- a/tests/functional2/testlib/fixtures/nix.py
+++ b/tests/functional2/testlib/fixtures/nix.py
@@ -445,7 +445,7 @@ def pytest_generate_tests(metafunc: pytest.Metafunc):
     if "nix" not in metafunc.fixturenames or "daemon" in metafunc.fixturenames:
         return
     if not list(metafunc.definition.iter_markers("no_daemon")):
-        protocols = [None]
+        protocols = [None, "legacy-combined"]
         # do not enable them the protocols for now
         # protocols += daemon_protocols # noqa ERA001
         ids = protocols
diff --git a/tests/functional2/testlib/fixtures/test_env.py b/tests/functional2/testlib/fixtures/test_env.py
index 53e998d61..98cb18ebe 100644
--- a/tests/functional2/testlib/fixtures/test_env.py
+++ b/tests/functional2/testlib/fixtures/test_env.py
@@ -131,6 +131,7 @@ def test_env_to_env(tmp_path: Path):
         "BUILD_TEST_SHELL",
         "TMPDIR",
         "BUILD_TEST_ENV",
+        "ASAN_OPTIONS",
     } | ({"_NIX_TEST_NO_SANDBOX"} if sys.platform == "darwin" else set())