diff --git a/novaclient/tests/unit/v2/test_shell.py b/novaclient/tests/unit/v2/test_shell.py
index cfd81fccb..06224ed31 100644
--- a/novaclient/tests/unit/v2/test_shell.py
+++ b/novaclient/tests/unit/v2/test_shell.py
@@ -1583,6 +1583,14 @@ class ShellTest(utils.TestCase):
         self.assert_called('POST', '/servers/uuid3/action', body, pos=3)
         self.assert_called('POST', '/servers/uuid4/action', body, pos=4)
 
+    def test_host_evacuate_list_with_max_servers(self):
+        self.run_command('host-evacuate-live --max-servers 1 hyper')
+        self.assert_called('GET', '/os-hypervisors/hyper/servers', pos=0)
+        body = {'os-migrateLive': {'host': None,
+                                   'block_migration': False,
+                                   'disk_over_commit': False}}
+        self.assert_called('POST', '/servers/uuid1/action', body, pos=1)
+
     def test_reset_state(self):
         self.run_command('reset-state sample-server')
         self.assert_called('POST', '/servers/1234/action',
diff --git a/novaclient/v2/contrib/host_evacuate_live.py b/novaclient/v2/contrib/host_evacuate_live.py
index 276fb2f70..f91599bbd 100644
--- a/novaclient/v2/contrib/host_evacuate_live.py
+++ b/novaclient/v2/contrib/host_evacuate_live.py
@@ -54,15 +54,25 @@ def _server_live_migrate(cs, server, args):
     action='store_true',
     default=False,
     help=_('Enable disk overcommit.'))
+@cliutils.arg(
+    '--max-servers',
+    type=int,
+    dest='max_servers',
+    metavar='<max_servers>',
+    help='Maximum number of servers to live migrate simultaneously')
 def do_host_evacuate_live(cs, args):
     """Live migrate all instances of the specified host
     to other available hosts.
     """
     hypervisors = cs.hypervisors.search(args.host, servers=True)
     response = []
+    migrating = 0
     for hyper in hypervisors:
         for server in getattr(hyper, 'servers', []):
             response.append(_server_live_migrate(cs, server, args))
+            migrating = migrating + 1
+            if args.max_servers is not None and migrating >= args.max_servers:
+                break
 
     utils.print_list(response, ["Server UUID", "Live Migration Accepted",
                                 "Error Message"])