diff --git a/pkgs/clan-cli/clan_lib/conftest.py b/pkgs/clan-cli/clan_lib/conftest.py
index 29bf40f42..ae3d2d268 100644
--- a/pkgs/clan-cli/clan_lib/conftest.py
+++ b/pkgs/clan-cli/clan_lib/conftest.py
@@ -1,3 +1,6 @@
 pytest_plugins = [
     "clan_cli.tests.fixtures_flakes",
+    "clan_cli.tests.hosts",
+    "clan_cli.tests.sshd",
+    "clan_cli.tests.runtime",
 ]
diff --git a/pkgs/clan-cli/clan_cli/tests/test_ssh_remote.py b/pkgs/clan-cli/clan_lib/ssh/remote_test.py
similarity index 99%
rename from pkgs/clan-cli/clan_cli/tests/test_ssh_remote.py
rename to pkgs/clan-cli/clan_lib/ssh/remote_test.py
index 3216f7dba..04441f3a6 100644
--- a/pkgs/clan-cli/clan_cli/tests/test_ssh_remote.py
+++ b/pkgs/clan-cli/clan_lib/ssh/remote_test.py
@@ -5,6 +5,7 @@ from typing import Any, NamedTuple
 
 import pytest
 from clan_cli.ssh.host_key import HostKeyCheck
+
 from clan_lib.async_run import AsyncRuntime
 from clan_lib.cmd import ClanCmdTimeoutError, Log, RunOpts
 from clan_lib.errors import ClanError, CmdOut