diff --git a/lib/crates/fabro-cli/tests/it/cmd/config_show.rs b/lib/crates/fabro-cli/tests/it/cmd/config_show.rs
deleted file mode 100644
index ae2df16a7..000000000
--- a/lib/crates/fabro-cli/tests/it/cmd/config_show.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use fabro_test::{fabro_snapshot, test_context};
-
-#[test]
-fn help() {
-    let context = test_context!();
-    let mut cmd = context.settings();
-    cmd.arg("--help");
-    fabro_snapshot!(context.filters(), cmd, @"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    Inspect merged configuration
-
-    Usage: fabro settings [OPTIONS] [WORKFLOW]
-
-    Arguments:
-      [WORKFLOW]  Optional workflow name, .fabro path, or .toml run config to overlay
-
-    Options:
-          --debug                      Enable DEBUG-level logging (default is INFO) [env: FABRO_DEBUG=]
-          --no-upgrade-check           Disable automatic upgrade check [env: FABRO_NO_UPGRADE_CHECK=true]
-          --quiet                      Suppress non-essential output [env: FABRO_QUIET=]
-          --verbose                    Enable verbose output [env: FABRO_VERBOSE=]
-          --storage-dir <STORAGE_DIR>  Storage directory (default: ~/.fabro) [env: FABRO_STORAGE_DIR=[STORAGE_DIR]]
-      -h, --help                       Print help
-    ----- stderr -----
-    ");
-}
diff --git a/lib/crates/fabro-cli/tests/it/cmd/mod.rs b/lib/crates/fabro-cli/tests/it/cmd/mod.rs
index 2331b54d3..1df64d5fb 100644
--- a/lib/crates/fabro-cli/tests/it/cmd/mod.rs
+++ b/lib/crates/fabro-cli/tests/it/cmd/mod.rs
@@ -4,8 +4,6 @@ mod asset_list;
 mod attach;
 mod completion;
 mod config;
-mod config_show;
-mod cp;
 mod create;
 mod detached;
 mod diff;
@@ -32,7 +30,6 @@ mod pr_list;
 mod pr_merge;
 mod pr_view;
 mod preflight;
-mod preview;
 mod provider;
 mod provider_login;
 mod ps;
@@ -43,6 +40,9 @@ mod resume;
 mod rewind;
 mod rm;
 mod run;
+mod sandbox_cp;
+mod sandbox_preview;
+mod sandbox_ssh;
 mod secret;
 mod secret_get;
 mod secret_list;
@@ -51,7 +51,6 @@ mod secret_set;
 mod send_analytics;
 mod send_panic;
 mod server;
-mod ssh;
 mod start;
 mod store;
 mod store_dump;
diff --git a/lib/crates/fabro-cli/tests/it/cmd/cp.rs b/lib/crates/fabro-cli/tests/it/cmd/sandbox_cp.rs
similarity index 93%
rename from lib/crates/fabro-cli/tests/it/cmd/cp.rs
rename to lib/crates/fabro-cli/tests/it/cmd/sandbox_cp.rs
index c0a8fcdca..d2bc39f93 100644
--- a/lib/crates/fabro-cli/tests/it/cmd/cp.rs
+++ b/lib/crates/fabro-cli/tests/it/cmd/sandbox_cp.rs
@@ -3,8 +3,8 @@ use fabro_test::{fabro_snapshot, test_context};
 #[test]
 fn help() {
     let context = test_context!();
-    let mut cmd = context.cp();
-    cmd.arg("--help");
+    let mut cmd = context.command();
+    cmd.args(["sandbox", "cp", "--help"]);
     fabro_snapshot!(context.filters(), cmd, @"
     success: true
     exit_code: 0
diff --git a/lib/crates/fabro-cli/tests/it/cmd/preview.rs b/lib/crates/fabro-cli/tests/it/cmd/sandbox_preview.rs
similarity index 93%
rename from lib/crates/fabro-cli/tests/it/cmd/preview.rs
rename to lib/crates/fabro-cli/tests/it/cmd/sandbox_preview.rs
index 2c03c208a..a7aed84d9 100644
--- a/lib/crates/fabro-cli/tests/it/cmd/preview.rs
+++ b/lib/crates/fabro-cli/tests/it/cmd/sandbox_preview.rs
@@ -3,8 +3,8 @@ use fabro_test::{fabro_snapshot, test_context};
 #[test]
 fn help() {
     let context = test_context!();
-    let mut cmd = context.preview();
-    cmd.arg("--help");
+    let mut cmd = context.command();
+    cmd.args(["sandbox", "preview", "--help"]);
     fabro_snapshot!(context.filters(), cmd, @"
     success: true
     exit_code: 0
diff --git a/lib/crates/fabro-cli/tests/it/cmd/ssh.rs b/lib/crates/fabro-cli/tests/it/cmd/sandbox_ssh.rs
similarity index 93%
rename from lib/crates/fabro-cli/tests/it/cmd/ssh.rs
rename to lib/crates/fabro-cli/tests/it/cmd/sandbox_ssh.rs
index a2c819963..6dd868ceb 100644
--- a/lib/crates/fabro-cli/tests/it/cmd/ssh.rs
+++ b/lib/crates/fabro-cli/tests/it/cmd/sandbox_ssh.rs
@@ -3,8 +3,8 @@ use fabro_test::{fabro_snapshot, test_context};
 #[test]
 fn help() {
     let context = test_context!();
-    let mut cmd = context.ssh();
-    cmd.arg("--help");
+    let mut cmd = context.command();
+    cmd.args(["sandbox", "ssh", "--help"]);
     fabro_snapshot!(context.filters(), cmd, @"
     success: true
     exit_code: 0
diff --git a/lib/crates/fabro-test/src/lib.rs b/lib/crates/fabro-test/src/lib.rs
index 4f5e69351..dad058a91 100644
--- a/lib/crates/fabro-test/src/lib.rs
+++ b/lib/crates/fabro-test/src/lib.rs
@@ -168,13 +168,6 @@ impl TestContext {
         cmd
     }
 
-    /// Build a `sandbox cp` subcommand.
-    pub fn cp(&self) -> Command {
-        let mut cmd = self.command();
-        cmd.args(["sandbox", "cp"]);
-        cmd
-    }
-
     /// Build an `init` subcommand.
     pub fn init_cmd(&self) -> Command {
         let mut cmd = self.command();
@@ -196,13 +189,6 @@ impl TestContext {
         cmd
     }
 
-    /// Build a `sandbox preview` subcommand.
-    pub fn preview(&self) -> Command {
-        let mut cmd = self.command();
-        cmd.args(["sandbox", "preview"]);
-        cmd
-    }
-
     /// Build a `repo` subcommand.
     pub fn repo(&self) -> Command {
         let mut cmd = self.command();
@@ -210,13 +196,6 @@ impl TestContext {
         cmd
     }
 
-    /// Build a `sandbox ssh` subcommand.
-    pub fn ssh(&self) -> Command {
-        let mut cmd = self.command();
-        cmd.args(["sandbox", "ssh"]);
-        cmd
-    }
-
     /// Build a `system` subcommand.
     pub fn system(&self) -> Command {
         let mut cmd = self.command();