diff --git a/lib/crates/fabro-cli/tests/cmd/doctor/header.stdout b/lib/crates/fabro-cli/tests/cmd/doctor/header.stdout
deleted file mode 100644
index 50fe30806..000000000
--- a/lib/crates/fabro-cli/tests/cmd/doctor/header.stdout
+++ /dev/null
@@ -1,3 +0,0 @@
-...
-[..]Fabro Doctor[..]
-...
diff --git a/lib/crates/fabro-cli/tests/cmd/doctor/header.toml b/lib/crates/fabro-cli/tests/cmd/doctor/header.toml
deleted file mode 100644
index 933a2987d..000000000
--- a/lib/crates/fabro-cli/tests/cmd/doctor/header.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.name = "fabro"
-args = ["doctor"]
-
-[env]
-inherit = false
diff --git a/lib/crates/fabro-cli/tests/cmd/doctor/verbose.stdout b/lib/crates/fabro-cli/tests/cmd/doctor/verbose.stdout
deleted file mode 100644
index 50fe30806..000000000
--- a/lib/crates/fabro-cli/tests/cmd/doctor/verbose.stdout
+++ /dev/null
@@ -1,3 +0,0 @@
-...
-[..]Fabro Doctor[..]
-...
diff --git a/lib/crates/fabro-cli/tests/cmd/doctor/verbose.toml b/lib/crates/fabro-cli/tests/cmd/doctor/verbose.toml
deleted file mode 100644
index 9612357a7..000000000
--- a/lib/crates/fabro-cli/tests/cmd/doctor/verbose.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.name = "fabro"
-args = ["doctor", "-v"]
-
-[env]
-inherit = false
diff --git a/lib/crates/fabro-cli/tests/trycmd.rs b/lib/crates/fabro-cli/tests/trycmd.rs
index 33129a0d5..dca631493 100644
--- a/lib/crates/fabro-cli/tests/trycmd.rs
+++ b/lib/crates/fabro-cli/tests/trycmd.rs
@@ -1,6 +1,25 @@
-#[test]
-fn cli_tests() {
-    trycmd::TestCases::new()
-        .case("tests/cmd/**/*.trycmd")
-        .case("tests/cmd/**/*.toml");
+macro_rules! trycmd_subcommand {
+    ($name:ident, $dir:expr) => {
+        #[test]
+        fn $name() {
+            trycmd::TestCases::new()
+                .case(concat!("tests/cmd/", $dir, "/*.trycmd"))
+                .case(concat!("tests/cmd/", $dir, "/*.toml"));
+        }
+    };
 }
+
+trycmd_subcommand!(cli_cp, "cp");
+trycmd_subcommand!(cli_doctor, "doctor");
+trycmd_subcommand!(cli_exec, "exec");
+trycmd_subcommand!(cli_init, "init");
+trycmd_subcommand!(cli_install, "install");
+trycmd_subcommand!(cli_llm, "llm");
+trycmd_subcommand!(cli_model, "model");
+trycmd_subcommand!(cli_pr, "pr");
+trycmd_subcommand!(cli_preview, "preview");
+trycmd_subcommand!(cli_run, "run");
+trycmd_subcommand!(cli_ssh, "ssh");
+trycmd_subcommand!(cli_system, "system");
+trycmd_subcommand!(cli_top_level, "top-level");
+trycmd_subcommand!(cli_validate, "validate");