diff --git a/crates/radicle-cli/tests/commands.rs b/crates/radicle-cli/tests/commands.rs
index b977dc77..0709967d 100644
--- a/crates/radicle-cli/tests/commands.rs
+++ b/crates/radicle-cli/tests/commands.rs
@@ -29,6 +29,7 @@ mod commands {
     mod remote;
     mod sync;
     mod utility;
+    mod watch;
 }
 
 /// Run a CLI test file.
@@ -138,36 +139,6 @@ fn rad_remote() {
     .unwrap();
 }
 
-#[test]
-fn rad_watch() {
-    let mut environment = Environment::new();
-    let mut alice = environment.node("alice");
-    let bob = environment.node("bob");
-    let (repo, _) = environment.repository(&alice);
-    let rid = alice.project_from("heartwood", "Radicle Heartwood Protocol & Stack", &repo);
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-    bob.clone(rid, environment.work(&bob)).unwrap();
-
-    formula(&environment.tempdir(), "examples/rad-watch.md")
-        .unwrap()
-        .home(
-            "alice",
-            environment.work(&alice),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            environment.work(&bob).join("heartwood"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
 #[test]
 fn rad_workflow() {
     let mut environment = Environment::new();
diff --git a/crates/radicle-cli/tests/commands/watch.rs b/crates/radicle-cli/tests/commands/watch.rs
new file mode 100644
index 00000000..26c08ad0
--- /dev/null
+++ b/crates/radicle-cli/tests/commands/watch.rs
@@ -0,0 +1,32 @@
+use crate::util::environment::Environment;
+use crate::util::formula::formula;
+
+#[test]
+fn rad_watch() {
+    let mut environment = Environment::new();
+    let mut alice = environment.node("alice");
+    let bob = environment.node("bob");
+    let (repo, _) = environment.repository(&alice);
+    let rid = alice.project_from("heartwood", "Radicle Heartwood Protocol & Stack", &repo);
+
+    let alice = alice.spawn();
+    let mut bob = bob.spawn();
+
+    bob.connect(&alice).converge([&alice]);
+    bob.clone(rid, environment.work(&bob)).unwrap();
+
+    formula(&environment.tempdir(), "examples/rad-watch.md")
+        .unwrap()
+        .home(
+            "alice",
+            environment.work(&alice),
+            [("RAD_HOME", alice.home.path().display())],
+        )
+        .home(
+            "bob",
+            environment.work(&bob).join("heartwood"),
+            [("RAD_HOME", bob.home.path().display())],
+        )
+        .run()
+        .unwrap();
+}