diff --git a/tests/common/mod.rs b/cli/tests/common/mod.rs
similarity index 100%
rename from tests/common/mod.rs
rename to cli/tests/common/mod.rs
diff --git a/tests/test_abandon_command.rs b/cli/tests/test_abandon_command.rs
similarity index 100%
rename from tests/test_abandon_command.rs
rename to cli/tests/test_abandon_command.rs
diff --git a/tests/test_alias.rs b/cli/tests/test_alias.rs
similarity index 100%
rename from tests/test_alias.rs
rename to cli/tests/test_alias.rs
diff --git a/tests/test_branch_command.rs b/cli/tests/test_branch_command.rs
similarity index 100%
rename from tests/test_branch_command.rs
rename to cli/tests/test_branch_command.rs
diff --git a/tests/test_cat_command.rs b/cli/tests/test_cat_command.rs
similarity index 100%
rename from tests/test_cat_command.rs
rename to cli/tests/test_cat_command.rs
diff --git a/tests/test_checkout.rs b/cli/tests/test_checkout.rs
similarity index 100%
rename from tests/test_checkout.rs
rename to cli/tests/test_checkout.rs
diff --git a/tests/test_chmod_command.rs b/cli/tests/test_chmod_command.rs
similarity index 100%
rename from tests/test_chmod_command.rs
rename to cli/tests/test_chmod_command.rs
diff --git a/tests/test_commit_command.rs b/cli/tests/test_commit_command.rs
similarity index 100%
rename from tests/test_commit_command.rs
rename to cli/tests/test_commit_command.rs
diff --git a/tests/test_commit_template.rs b/cli/tests/test_commit_template.rs
similarity index 100%
rename from tests/test_commit_template.rs
rename to cli/tests/test_commit_template.rs
diff --git a/tests/test_concurrent_operations.rs b/cli/tests/test_concurrent_operations.rs
similarity index 100%
rename from tests/test_concurrent_operations.rs
rename to cli/tests/test_concurrent_operations.rs
diff --git a/tests/test_config_command.rs b/cli/tests/test_config_command.rs
similarity index 100%
rename from tests/test_config_command.rs
rename to cli/tests/test_config_command.rs
diff --git a/tests/test_debug_command.rs b/cli/tests/test_debug_command.rs
similarity index 100%
rename from tests/test_debug_command.rs
rename to cli/tests/test_debug_command.rs
diff --git a/tests/test_describe_command.rs b/cli/tests/test_describe_command.rs
similarity index 100%
rename from tests/test_describe_command.rs
rename to cli/tests/test_describe_command.rs
diff --git a/tests/test_diff_command.rs b/cli/tests/test_diff_command.rs
similarity index 100%
rename from tests/test_diff_command.rs
rename to cli/tests/test_diff_command.rs
diff --git a/tests/test_diffedit_command.rs b/cli/tests/test_diffedit_command.rs
similarity index 100%
rename from tests/test_diffedit_command.rs
rename to cli/tests/test_diffedit_command.rs
diff --git a/tests/test_duplicate_command.rs b/cli/tests/test_duplicate_command.rs
similarity index 100%
rename from tests/test_duplicate_command.rs
rename to cli/tests/test_duplicate_command.rs
diff --git a/tests/test_edit_command.rs b/cli/tests/test_edit_command.rs
similarity index 100%
rename from tests/test_edit_command.rs
rename to cli/tests/test_edit_command.rs
diff --git a/tests/test_git_clone.rs b/cli/tests/test_git_clone.rs
similarity index 100%
rename from tests/test_git_clone.rs
rename to cli/tests/test_git_clone.rs
diff --git a/tests/test_git_colocated.rs b/cli/tests/test_git_colocated.rs
similarity index 100%
rename from tests/test_git_colocated.rs
rename to cli/tests/test_git_colocated.rs
diff --git a/tests/test_git_fetch.rs b/cli/tests/test_git_fetch.rs
similarity index 100%
rename from tests/test_git_fetch.rs
rename to cli/tests/test_git_fetch.rs
diff --git a/tests/test_git_import_export.rs b/cli/tests/test_git_import_export.rs
similarity index 100%
rename from tests/test_git_import_export.rs
rename to cli/tests/test_git_import_export.rs
diff --git a/tests/test_git_push.rs b/cli/tests/test_git_push.rs
similarity index 100%
rename from tests/test_git_push.rs
rename to cli/tests/test_git_push.rs
diff --git a/tests/test_git_remotes.rs b/cli/tests/test_git_remotes.rs
similarity index 100%
rename from tests/test_git_remotes.rs
rename to cli/tests/test_git_remotes.rs
diff --git a/tests/test_git_submodule.rs b/cli/tests/test_git_submodule.rs
similarity index 100%
rename from tests/test_git_submodule.rs
rename to cli/tests/test_git_submodule.rs
diff --git a/tests/test_gitignores.rs b/cli/tests/test_gitignores.rs
similarity index 100%
rename from tests/test_gitignores.rs
rename to cli/tests/test_gitignores.rs
diff --git a/tests/test_global_opts.rs b/cli/tests/test_global_opts.rs
similarity index 100%
rename from tests/test_global_opts.rs
rename to cli/tests/test_global_opts.rs
diff --git a/tests/test_init_command.rs b/cli/tests/test_init_command.rs
similarity index 100%
rename from tests/test_init_command.rs
rename to cli/tests/test_init_command.rs
diff --git a/tests/test_interdiff_command.rs b/cli/tests/test_interdiff_command.rs
similarity index 100%
rename from tests/test_interdiff_command.rs
rename to cli/tests/test_interdiff_command.rs
diff --git a/tests/test_log_command.rs b/cli/tests/test_log_command.rs
similarity index 100%
rename from tests/test_log_command.rs
rename to cli/tests/test_log_command.rs
diff --git a/tests/test_move_command.rs b/cli/tests/test_move_command.rs
similarity index 100%
rename from tests/test_move_command.rs
rename to cli/tests/test_move_command.rs
diff --git a/tests/test_new_command.rs b/cli/tests/test_new_command.rs
similarity index 100%
rename from tests/test_new_command.rs
rename to cli/tests/test_new_command.rs
diff --git a/tests/test_obslog_command.rs b/cli/tests/test_obslog_command.rs
similarity index 100%
rename from tests/test_obslog_command.rs
rename to cli/tests/test_obslog_command.rs
diff --git a/tests/test_operations.rs b/cli/tests/test_operations.rs
similarity index 100%
rename from tests/test_operations.rs
rename to cli/tests/test_operations.rs
diff --git a/tests/test_rebase_command.rs b/cli/tests/test_rebase_command.rs
similarity index 100%
rename from tests/test_rebase_command.rs
rename to cli/tests/test_rebase_command.rs
diff --git a/tests/test_resolve_command.rs b/cli/tests/test_resolve_command.rs
similarity index 100%
rename from tests/test_resolve_command.rs
rename to cli/tests/test_resolve_command.rs
diff --git a/tests/test_restore_command.rs b/cli/tests/test_restore_command.rs
similarity index 100%
rename from tests/test_restore_command.rs
rename to cli/tests/test_restore_command.rs
diff --git a/tests/test_revset_output.rs b/cli/tests/test_revset_output.rs
similarity index 100%
rename from tests/test_revset_output.rs
rename to cli/tests/test_revset_output.rs
diff --git a/tests/test_show_command.rs b/cli/tests/test_show_command.rs
similarity index 100%
rename from tests/test_show_command.rs
rename to cli/tests/test_show_command.rs
diff --git a/tests/test_sparse_command.rs b/cli/tests/test_sparse_command.rs
similarity index 100%
rename from tests/test_sparse_command.rs
rename to cli/tests/test_sparse_command.rs
diff --git a/tests/test_split_command.rs b/cli/tests/test_split_command.rs
similarity index 100%
rename from tests/test_split_command.rs
rename to cli/tests/test_split_command.rs
diff --git a/tests/test_squash_command.rs b/cli/tests/test_squash_command.rs
similarity index 100%
rename from tests/test_squash_command.rs
rename to cli/tests/test_squash_command.rs
diff --git a/tests/test_status_command.rs b/cli/tests/test_status_command.rs
similarity index 100%
rename from tests/test_status_command.rs
rename to cli/tests/test_status_command.rs
diff --git a/tests/test_templater.rs b/cli/tests/test_templater.rs
similarity index 100%
rename from tests/test_templater.rs
rename to cli/tests/test_templater.rs
diff --git a/tests/test_undo.rs b/cli/tests/test_undo.rs
similarity index 100%
rename from tests/test_undo.rs
rename to cli/tests/test_undo.rs
diff --git a/tests/test_unsquash_command.rs b/cli/tests/test_unsquash_command.rs
similarity index 100%
rename from tests/test_unsquash_command.rs
rename to cli/tests/test_unsquash_command.rs
diff --git a/tests/test_untrack_command.rs b/cli/tests/test_untrack_command.rs
similarity index 100%
rename from tests/test_untrack_command.rs
rename to cli/tests/test_untrack_command.rs
diff --git a/tests/test_util_command.rs b/cli/tests/test_util_command.rs
similarity index 100%
rename from tests/test_util_command.rs
rename to cli/tests/test_util_command.rs
diff --git a/tests/test_workspaces.rs b/cli/tests/test_workspaces.rs
similarity index 100%
rename from tests/test_workspaces.rs
rename to cli/tests/test_workspaces.rs