diff --git a/swh/deposit/cli/admin.py b/swh/deposit/cli/admin.py
--- a/swh/deposit/cli/admin.py
+++ b/swh/deposit/cli/admin.py
@@ -247,27 +247,28 @@
     try:
         deposit = Deposit.objects.get(pk=deposit_id)
     except Deposit.DoesNotExist:
-        click.echo("Deposit %s does not exist." % deposit_id)
+        click.echo(f"Deposit {deposit_id} does not exist.")
         ctx.exit(1)
 
     # Check the deposit is in a reasonable state
     accepted_statuses = [DEPOSIT_STATUS_LOAD_SUCCESS, DEPOSIT_STATUS_LOAD_FAILURE]
     if deposit.status == DEPOSIT_STATUS_VERIFIED:
-        click.echo("Deposit %s's status already set for rescheduling." % (deposit_id))
+        click.echo(f"Deposit {deposit_id} already set for rescheduling.")
         ctx.exit(0)
 
     if deposit.status not in accepted_statuses:
         click.echo(
-            "Deposit %s's status be one of %s."
-            % (deposit_id, ", ".join(accepted_statuses))
+            f"Deposit {deposit_id} cannot be rescheduled (status: {deposit.status}).\n"
+            "Rescheduling deposit is only accepted for deposit with status: "
+            f"{', '.join(accepted_statuses)}."
         )
         ctx.exit(1)
 
     task_id = deposit.load_task_id
     if not task_id:
         click.echo(
-            "Deposit %s cannot be rescheduled. It misses the "
-            "associated task." % deposit_id
+            f"Deposit {deposit_id} cannot be rescheduled. It misses the "
+            "associated scheduler task id (field load_task_id)."
         )
         ctx.exit(1)
 
@@ -277,7 +278,7 @@
     deposit.status = DEPOSIT_STATUS_VERIFIED
     deposit.save()
 
-    # Trigger back the deposit
+    # Schedule back the deposit loading task
     scheduler = APIConfig().scheduler
     scheduler.set_status_tasks(
         [task_id], status="next_run_not_scheduled", next_run=datetime.now()
diff --git a/swh/deposit/tests/cli/test_admin.py b/swh/deposit/tests/cli/test_admin.py
--- a/swh/deposit/tests/cli/test_admin.py
+++ b/swh/deposit/tests/cli/test_admin.py
@@ -6,6 +6,7 @@
 import pytest
 
 from swh.deposit.cli.admin import admin as cli
+from swh.deposit.config import DEPOSIT_STATUS_DEPOSITED, DEPOSIT_STATUS_PARTIAL
 from swh.deposit.models import DepositClient, DepositCollection
 
 
@@ -187,3 +188,109 @@
 User '{user_name}' updated.
 """
     )
+
+
+def test_cli_admin_reschedule_unknown_deposit(cli_runner):
+    """Rescheduling unknown deposit should report failure
+
+    """
+    unknown_deposit_id = 666
+
+    from swh.deposit.models import Deposit
+
+    try:
+        Deposit.objects.get(id=unknown_deposit_id)
+    except Deposit.DoesNotExist:
+        pass
+
+    result = cli_runner.invoke(
+        cli, ["deposit", "reschedule", "--deposit-id", unknown_deposit_id]
+    )
+
+    assert result.output == f"Deposit {unknown_deposit_id} does not exist.\n"
+    assert result.exit_code == 1
+
+
+def test_cli_admin_reschedule_verified_deposit(cli_runner, complete_deposit):
+    """Rescheduling verified deposit should do nothing but report
+
+    """
+    deposit = complete_deposit
+    deposit.status = "verified"
+    deposit.save()
+
+    result = cli_runner.invoke(
+        cli, ["deposit", "reschedule", "--deposit-id", deposit.id]
+    )
+
+    assert result.output == f"Deposit {deposit.id} already set for rescheduling.\n"
+    assert result.exit_code == 0
+
+
+@pytest.mark.parametrize(
+    "status_to_check", [DEPOSIT_STATUS_PARTIAL, DEPOSIT_STATUS_DEPOSITED]
+)
+def test_cli_admin_reschedule_unaccepted_deposit_status(
+    status_to_check, cli_runner, complete_deposit
+):
+    """Rescheduling verified deposit should do nothing but report
+
+    """
+    deposit = complete_deposit
+    deposit.status = status_to_check  # not accepted status will fail the check
+    deposit.save()
+
+    result = cli_runner.invoke(
+        cli, ["deposit", "reschedule", "--deposit-id", deposit.id]
+    )
+
+    assert result.output == (
+        f"Deposit {deposit.id} cannot be rescheduled (status: {deposit.status}).\n"
+        "Rescheduling deposit is only accepted for deposit with status: done, failed.\n"
+    )
+    assert result.exit_code == 1
+
+
+def test_cli_admin_reschedule_missing_task_id(cli_runner, complete_deposit):
+    """Rescheduling deposit with no load_task_id cannot work.
+
+    """
+    deposit = complete_deposit
+    deposit.load_task_id = ""  # drop the load-task-id so it fails the check
+    deposit.save()
+
+    result = cli_runner.invoke(
+        cli, ["deposit", "reschedule", "--deposit-id", deposit.id]
+    )
+
+    assert result.output == (
+        f"Deposit {deposit.id} cannot be rescheduled. It misses the "
+        "associated scheduler task id (field load_task_id).\n"
+    )
+    assert result.exit_code == 1
+
+
+# def test_cli_admin_reschedule_nominal(cli_runner, complete_deposit, swh_scheduler):
+#     """Rescheduling deposit with no load_task_id cannot work.
+
+#     """
+#     from swh.deposit.models import Deposit
+#     deposit = complete_deposit
+#     import pdb; pdb.set_trace()
+
+#     deposit.load_task_id = 10  # drop the load-task-id so it fails the check
+#     deposit.save()
+
+#     result = cli_runner.invoke(
+#         cli, ["deposit", "reschedule", "--deposit-id", deposit.id]
+#     )
+#     assert result.exit_code == 0
+
+#     # Ensure the
+#     deposit = Deposit.objects.get(id=deposit.id)
+
+#     # got reset to a state which allows rescheduling
+#     assert deposit.id
+#     assert deposit.swhid is None
+#     assert deposit.swhid_context is None
+#     assert deposit.status == DEPOSIT_STATUS_VERIFIED