diff --git a/pkgs/clan-cli/clan_cli/machines/__init__.py b/pkgs/clan-cli/clan_cli/machines/__init__.py
index fb12327e7..05d44eb2f 100644
--- a/pkgs/clan-cli/clan_cli/machines/__init__.py
+++ b/pkgs/clan-cli/clan_cli/machines/__init__.py
@@ -22,8 +22,8 @@ def register_parser(parser: argparse.ArgumentParser) -> None:
     create_parser = subparser.add_parser("create", help="Create a machine")
     register_create_parser(create_parser)
 
-    delete_parser = subparser.add_parser("delete", help="Delete a machine")
-    register_delete_parser(delete_parser)
+    remove_parser = subparser.add_parser("remove", help="Remove a machine")
+    register_delete_parser(remove_parser)
 
     list_parser = subparser.add_parser("list", help="List machines")
     register_list_parser(list_parser)
diff --git a/pkgs/clan-cli/tests/test_machines_cli.py b/pkgs/clan-cli/tests/test_machines_cli.py
new file mode 100644
index 000000000..a2e3fa83e
--- /dev/null
+++ b/pkgs/clan-cli/tests/test_machines_cli.py
@@ -0,0 +1,21 @@
+from pathlib import Path
+
+import pytest
+from cli import Cli
+
+
+def test_machine_subcommands(clan_flake: Path, capsys: pytest.CaptureFixture) -> None:
+    cli = Cli()
+    cli.run(["machines", "create", "machine1"])
+
+    capsys.readouterr()
+    cli.run(["machines", "list"])
+    out = capsys.readouterr()
+    assert "machine1\n" == out.out
+
+    cli.run(["machines", "remove", "machine1"])
+
+    capsys.readouterr()
+    cli.run(["machines", "list"])
+    out = capsys.readouterr()
+    assert "" == out.out