diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py
index 21a335dce..2952c604f 100644
--- a/novaclient/v1_1/shell.py
+++ b/novaclient/v1_1/shell.py
@@ -1396,6 +1396,10 @@ def do_list(cs, args):
             'Power State',
             'Networks'
         ]
+        # If getting the data for all tenants, print
+        # Tenant ID as well
+        if search_opts['all_tenants']:
+            columns.insert(2, 'Tenant ID')
     formatters['Networks'] = utils._format_servers_list_networks
     sortby_index = 1
     if args.sort: