diff --git a/ironicclient/tests/v1/test_node_shell.py b/ironicclient/tests/v1/test_node_shell.py
index 0ba3ba861..3ca8f3cd9 100644
--- a/ironicclient/tests/v1/test_node_shell.py
+++ b/ironicclient/tests/v1/test_node_shell.py
@@ -96,6 +96,36 @@ class NodeShellTest(utils.BaseTestCase):
                   }
         client_mock.node.vendor_passthru.assert_called_once_with(**kwargs)
 
+    def test_do_node_set_provision_state_active(self):
+        client_mock = mock.MagicMock()
+        args = mock.MagicMock()
+        args.node = 'node_uuid'
+        args.provision_state = 'active'
+
+        n_shell.do_node_set_provision_state(client_mock, args)
+        client_mock.node.set_provision_state.assert_called_once_with(
+            'node_uuid', 'active')
+
+    def test_do_node_set_provision_state_deleted(self):
+        client_mock = mock.MagicMock()
+        args = mock.MagicMock()
+        args.node = 'node_uuid'
+        args.provision_state = 'deleted'
+
+        n_shell.do_node_set_provision_state(client_mock, args)
+        client_mock.node.set_provision_state.assert_called_once_with(
+            'node_uuid', 'deleted')
+
+    def test_do_node_set_provision_state_rebuild(self):
+        client_mock = mock.MagicMock()
+        args = mock.MagicMock()
+        args.node = 'node_uuid'
+        args.provision_state = 'rebuild'
+
+        n_shell.do_node_set_provision_state(client_mock, args)
+        client_mock.node.set_provision_state.assert_called_once_with(
+            'node_uuid', 'rebuild')
+
     def test_do_node_set_boot_device(self):
         client_mock = mock.MagicMock()
         args = mock.MagicMock()
diff --git a/ironicclient/v1/node_shell.py b/ironicclient/v1/node_shell.py
index 5d5213f61..40ebee9cd 100644
--- a/ironicclient/v1/node_shell.py
+++ b/ironicclient/v1/node_shell.py
@@ -266,8 +266,8 @@ def do_node_set_power_state(cc, args):
 @cliutils.arg(
     'provision_state',
     metavar='<provision state>',
-    choices=['active', 'deleted'],
-    help="Supported states: 'active' or 'deleted'")
+    choices=['active', 'deleted', 'rebuild'],
+    help="Supported states: 'active' or 'deleted' or 'rebuild'")
 def do_node_set_provision_state(cc, args):
     """Provision an instance on, or delete an instance from a node."""
     cc.node.set_provision_state(args.node, args.provision_state)