diff --git a/requirements.txt b/requirements.txt
index c027ec57e07..7de5b3becef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,5 +13,4 @@ pyyaml==3.11
 requests==2.9.1
 setuptools==30.4.0
 six==1.10.0
-tabulate==0.7.5
 vcrpy==1.10.3
diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
index 0ac65af8b92..f14d4fa5e4d 100644
--- a/src/azure-cli-core/setup.py
+++ b/src/azure-cli-core/setup.py
@@ -64,7 +64,7 @@
     'pyyaml',
     'requests',
     'six',
-    'tabulate',
+    'tabulate==0.7.7',
 ]
 
 if sys.version_info < (3, 4):
diff --git a/src/azure-cli-core/tests/test_output.py b/src/azure-cli-core/tests/test_output.py
index bbe4e460503..f8864cafe13 100644
--- a/src/azure-cli-core/tests/test_output.py
+++ b/src/azure-cli-core/tests/test_output.py
@@ -14,16 +14,7 @@
 import azure.cli.core.util as util
 
 
-class TestOutput(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        pass
-
-    @classmethod
-    def tearDownClass(cls):
-        pass
-
+class TestCoreCLIOutput(unittest.TestCase):
     def setUp(self):
         self.io = StringIO()
 
@@ -85,9 +76,9 @@ def test_out_table(self):
         obj['val'] = '0b1f6472'
         output_producer.out(CommandResultItem(obj))
         self.assertEqual(util.normalize_newlines(self.io.getvalue()), util.normalize_newlines(
-            """  Active  Val
+            """Active    Val
 --------  --------
-       1  0b1f6472
+True      0b1f6472
 """))
 
     def test_out_table_list_of_lists(self):
@@ -122,9 +113,9 @@ def test_out_table_no_query_no_transformer_order(self):
         output_producer.out(result_item)
         # Should be alphabetical order as no table transformer and query is not active.
         self.assertEqual(util.normalize_newlines(self.io.getvalue()), util.normalize_newlines(
-            """  Active  Name    Sub       Val
+            """Active    Name    Sub       Val
 --------  ------  --------  --------------
-       1  qwerty  0b1f6472  0b1f6472qwerty
+True      qwerty  0b1f6472  0b1f6472qwerty
 """))
 
     def test_out_table_no_query_yes_transformer_order(self):
@@ -139,9 +130,9 @@ def transformer(r):
         output_producer.out(result_item)
         # Should be table transformer order
         self.assertEqual(util.normalize_newlines(self.io.getvalue()), util.normalize_newlines(
-            """Name    Val               Active  Sub
+            """Name    Val             Active    Sub
 ------  --------------  --------  --------
-qwerty  0b1f6472qwerty         1  0b1f6472
+qwerty  0b1f6472qwerty  True      0b1f6472
 """))
 
     # TSV output tests