diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/_validators.py b/src/azure-cli/azure/cli/command_modules/keyvault/_validators.py
index c77a43bb8b7..5129377efa0 100644
--- a/src/azure-cli/azure/cli/command_modules/keyvault/_validators.py
+++ b/src/azure-cli/azure/cli/command_modules/keyvault/_validators.py
@@ -426,7 +426,7 @@ def validate_deleted_vault_or_hsm_name(cmd, ns):
     hsm_name = getattr(ns, 'hsm_name', None)
 
     if not vault_name and not hsm_name:
-        raise CLIError('Please specify --vault-name or --hsm-name.')
+        raise CLIError('Please specify --name or --hsm-name.')
 
     if vault_name:
         resource_name = vault_name
diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_validators.py b/src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_validators.py
new file mode 100644
index 00000000000..40aabcfc4c4
--- /dev/null
+++ b/src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_validators.py
@@ -0,0 +1,18 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+import argparse
+from unittest import TestCase, mock
+
+from knack.util import CLIError
+
+
+class DeletedVaultOrHsmValidatorTest(TestCase):
+    def test_validate_deleted_vault_or_hsm_name_without_name(self):
+        from azure.cli.command_modules.keyvault._validators import validate_deleted_vault_or_hsm_name
+
+        ns = argparse.Namespace(vault_name=None, hsm_name=None)
+        with self.assertRaisesRegex(CLIError, 'Please specify --name or --hsm-name.'):
+            validate_deleted_vault_or_hsm_name(mock.Mock(), ns)