diff --git a/cli/tests/acl.rs b/cli/tests/cli/acl.rs
similarity index 100%
rename from cli/tests/acl.rs
rename to cli/tests/cli/acl.rs
diff --git a/cli/tests/append.rs b/cli/tests/cli/append.rs
similarity index 100%
rename from cli/tests/append.rs
rename to cli/tests/cli/append.rs
diff --git a/cli/tests/chmod.rs b/cli/tests/cli/chmod.rs
similarity index 100%
rename from cli/tests/chmod.rs
rename to cli/tests/cli/chmod.rs
diff --git a/cli/tests/chown.rs b/cli/tests/cli/chown.rs
similarity index 100%
rename from cli/tests/chown.rs
rename to cli/tests/cli/chown.rs
diff --git a/cli/tests/concat.rs b/cli/tests/cli/concat.rs
similarity index 100%
rename from cli/tests/concat.rs
rename to cli/tests/cli/concat.rs
diff --git a/cli/tests/delete.rs b/cli/tests/cli/delete.rs
similarity index 100%
rename from cli/tests/delete.rs
rename to cli/tests/cli/delete.rs
diff --git a/cli/tests/encrypt.rs b/cli/tests/cli/encrypt.rs
similarity index 100%
rename from cli/tests/encrypt.rs
rename to cli/tests/cli/encrypt.rs
diff --git a/cli/tests/hardlink.rs b/cli/tests/cli/hardlink.rs
similarity index 100%
rename from cli/tests/hardlink.rs
rename to cli/tests/cli/hardlink.rs
diff --git a/cli/tests/keep_acl.rs b/cli/tests/cli/keep_acl.rs
similarity index 100%
rename from cli/tests/keep_acl.rs
rename to cli/tests/cli/keep_acl.rs
diff --git a/cli/tests/keep_all.rs b/cli/tests/cli/keep_all.rs
similarity index 100%
rename from cli/tests/keep_all.rs
rename to cli/tests/cli/keep_all.rs
diff --git a/cli/tests/list.rs b/cli/tests/cli/list.rs
similarity index 100%
rename from cli/tests/list.rs
rename to cli/tests/cli/list.rs
diff --git a/cli/tests/cli/main.rs b/cli/tests/cli/main.rs
new file mode 100644
index 000000000..12477467c
--- /dev/null
+++ b/cli/tests/cli/main.rs
@@ -0,0 +1,23 @@
+mod acl;
+mod append;
+mod chmod;
+mod chown;
+mod concat;
+mod delete;
+mod encrypt;
+mod hardlink;
+mod keep_acl;
+mod keep_all;
+mod list;
+mod multipart;
+mod password_from_file;
+mod password_hash;
+mod restore_acl;
+mod restore_acl_0_19_1;
+mod solid_mode;
+mod split;
+mod strip;
+mod symlink;
+mod update;
+mod user_group;
+mod xattr;
diff --git a/cli/tests/multipart.rs b/cli/tests/cli/multipart.rs
similarity index 100%
rename from cli/tests/multipart.rs
rename to cli/tests/cli/multipart.rs
diff --git a/cli/tests/password_from_file.rs b/cli/tests/cli/password_from_file.rs
similarity index 100%
rename from cli/tests/password_from_file.rs
rename to cli/tests/cli/password_from_file.rs
diff --git a/cli/tests/password_hash.rs b/cli/tests/cli/password_hash.rs
similarity index 100%
rename from cli/tests/password_hash.rs
rename to cli/tests/cli/password_hash.rs
diff --git a/cli/tests/restore_acl.rs b/cli/tests/cli/restore_acl.rs
similarity index 100%
rename from cli/tests/restore_acl.rs
rename to cli/tests/cli/restore_acl.rs
diff --git a/cli/tests/restore_acl_0_19_1.rs b/cli/tests/cli/restore_acl_0_19_1.rs
similarity index 100%
rename from cli/tests/restore_acl_0_19_1.rs
rename to cli/tests/cli/restore_acl_0_19_1.rs
diff --git a/cli/tests/solid_mode.rs b/cli/tests/cli/solid_mode.rs
similarity index 100%
rename from cli/tests/solid_mode.rs
rename to cli/tests/cli/solid_mode.rs
diff --git a/cli/tests/split.rs b/cli/tests/cli/split.rs
similarity index 100%
rename from cli/tests/split.rs
rename to cli/tests/cli/split.rs
diff --git a/cli/tests/strip.rs b/cli/tests/cli/strip.rs
similarity index 100%
rename from cli/tests/strip.rs
rename to cli/tests/cli/strip.rs
diff --git a/cli/tests/symlink.rs b/cli/tests/cli/symlink.rs
similarity index 100%
rename from cli/tests/symlink.rs
rename to cli/tests/cli/symlink.rs
diff --git a/cli/tests/update.rs b/cli/tests/cli/update.rs
similarity index 100%
rename from cli/tests/update.rs
rename to cli/tests/cli/update.rs
diff --git a/cli/tests/user_group.rs b/cli/tests/cli/user_group.rs
similarity index 100%
rename from cli/tests/user_group.rs
rename to cli/tests/cli/user_group.rs
diff --git a/cli/tests/xattr.rs b/cli/tests/cli/xattr.rs
similarity index 100%
rename from cli/tests/xattr.rs
rename to cli/tests/cli/xattr.rs