diff --git a/src/dotnet/PrintableTable.cs b/src/dotnet/PrintableTable.cs
index ce31e13cce..f5a0afd58c 100644
--- a/src/dotnet/PrintableTable.cs
+++ b/src/dotnet/PrintableTable.cs
@@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Cli
     // Represents a table (with rows of type T) that can be printed to a terminal.
     internal class PrintableTable<T>
     {
-        private const string ColumnDelimiter = "      ";
+        public const string ColumnDelimiter = "      ";
         private List<Column> _columns = new List<Column>();
 
         private class Column
diff --git a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs b/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs
index b567ac74db..2c3608d3cc 100644
--- a/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs
+++ b/src/dotnet/commands/dotnet-list/dotnet-list-tool/ListToolCommand.cs
@@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Tools.List.Tool
 {
     internal class ListToolCommand : CommandBase
     {
-        private const string CommandDelimiter = ", ";
+        public const string CommandDelimiter = ", ";
         private readonly AppliedOption _options;
         private readonly IToolPackageStore _toolPackageStore;
         private readonly IReporter _reporter;
@@ -66,20 +66,20 @@ private IEnumerable<IToolPackage> GetPackages()
                 .ToArray();
         }
 
-        private bool PackageHasCommands(IToolPackage p)
+        private bool PackageHasCommands(IToolPackage package)
         {
             try
             {
                 // Attempt to read the commands collection
                 // If it fails, print a warning and treat as no commands
-                return p.Commands.Count >= 0;
+                return package.Commands.Count >= 0;
             }
             catch (Exception ex) when (ex is ToolConfigurationException)
             {
                 _errorReporter.WriteLine(
                     string.Format(
                         LocalizableStrings.InvalidPackageWarning,
-                        p.Id,
+                        package.Id,
                         ex.Message).Yellow());
                 return false;
             }
diff --git a/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs b/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs
index 3b764abb4d..c378e0803f 100644
--- a/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs
+++ b/test/dotnet.Tests/CommandTests/ListToolCommandTests.cs
@@ -62,14 +62,7 @@ public void GivenNoInstalledPackagesItPrintsEmptyTable()
 
             command.Execute().Should().Be(0);
 
-            _reporter.Lines.Should().Equal(
-                string.Format(
-                    "{0}      {1}      {2}",
-                    LocalizableStrings.PackageIdColumn,
-                    LocalizableStrings.VersionColumn,
-                    LocalizableStrings.CommandsColumn
-                ),
-                "-------------------------------------");
+            _reporter.Lines.Should().Equal(EnumerateExpectedTableLines(store.Object));
         }
 
         [Fact]
@@ -92,15 +85,7 @@ public void GivenASingleInstalledPackageItPrintsThePackage()
 
             command.Execute().Should().Be(0);
 
-            _reporter.Lines.Should().Equal(
-                string.Format(
-                    "{0}      {1}            {2}",
-                    LocalizableStrings.PackageIdColumn,
-                    LocalizableStrings.VersionColumn,
-                    LocalizableStrings.CommandsColumn
-                ),
-                "-------------------------------------------",
-                "test.tool       1.3.5-preview      foo     ");
+            _reporter.Lines.Should().Equal(EnumerateExpectedTableLines(store.Object));
         }
 
         [Fact]
@@ -137,17 +122,7 @@ public void GivenMultipleInstalledPackagesItPrintsThePackages()
 
             command.Execute().Should().Be(0);
 
-            _reporter.Lines.Should().Equal(
-                string.Format(
-                    "{0}        {1}            {2} ",
-                    LocalizableStrings.PackageIdColumn,
-                    LocalizableStrings.VersionColumn,
-                    LocalizableStrings.CommandsColumn
-                ),
-                "----------------------------------------------",
-                "another.tool      2.7.3              bar      ",
-                "some.tool         1.0.0              fancy-foo",
-                "test.tool         1.3.5-preview      foo      ");
+            _reporter.Lines.Should().Equal(EnumerateExpectedTableLines(store.Object));
         }
 
         [Fact]
@@ -172,15 +147,7 @@ public void GivenAPackageWithMultipleCommandsItListsThem()
 
             command.Execute().Should().Be(0);
 
-            _reporter.Lines.Should().Equal(
-                string.Format(
-                    "{0}      {1}            {2}     ",
-                    LocalizableStrings.PackageIdColumn,
-                    LocalizableStrings.VersionColumn,
-                    LocalizableStrings.CommandsColumn
-                ),
-                "------------------------------------------------",
-                "test.tool       1.3.5-preview      foo, bar, baz");
+            _reporter.Lines.Should().Equal(EnumerateExpectedTableLines(store.Object));
         }
 
         [Fact]
@@ -212,20 +179,11 @@ public void GivenABrokenPackageItPrintsWarning()
             command.Execute().Should().Be(0);
 
             _reporter.Lines.Should().Equal(
-                string.Format(
-                    LocalizableStrings.InvalidPackageWarning,
-                    "another.tool",
-                    "broken"
-                ).Yellow(),
-                string.Format(
-                    "{0}      {1}            {2} ",
-                    LocalizableStrings.PackageIdColumn,
-                    LocalizableStrings.VersionColumn,
-                    LocalizableStrings.CommandsColumn
-                ),
-                "--------------------------------------------",
-                "some.tool       1.0.0              fancy-foo",
-                "test.tool       1.3.5-preview      foo      ");
+                EnumerateExpectedTableLines(store.Object).Prepend(
+                    string.Format(
+                        LocalizableStrings.InvalidPackageWarning,
+                        "another.tool",
+                        "broken").Yellow()));
         }
 
         private IToolPackage CreateMockToolPackage(string id, string version, IReadOnlyList<CommandSettings> commands)
@@ -257,5 +215,61 @@ private ListToolCommand CreateCommand(IToolPackageStore store, string options =
                 store,
                 _reporter);
         }
+
+        private IEnumerable<string> EnumerateExpectedTableLines(IToolPackageStore store)
+        {
+            string GetCommandsString(IToolPackage package)
+            {
+                return string.Join(ListToolCommand.CommandDelimiter, package.Commands.Select(c => c.Name));
+            }
+
+            var packages = store.EnumeratePackages().Where(PackageHasCommands).OrderBy(package => package.Id);
+            var columnDelimiter = PrintableTable<IToolPackageStore>.ColumnDelimiter;
+
+            int packageIdColumnWidth = LocalizableStrings.PackageIdColumn.Length;
+            int versionColumnWidth = LocalizableStrings.VersionColumn.Length;
+            int commandsColumnWidth = LocalizableStrings.CommandsColumn.Length;
+            foreach (var package in packages)
+            {
+                packageIdColumnWidth = Math.Max(packageIdColumnWidth, package.Id.ToString().Length);
+                versionColumnWidth = Math.Max(versionColumnWidth, package.Version.ToNormalizedString().Length);
+                commandsColumnWidth = Math.Max(commandsColumnWidth, GetCommandsString(package).Length);
+            }
+
+            yield return string.Format(
+                "{0}{1}{2}{3}{4}",
+                LocalizableStrings.PackageIdColumn.PadRight(packageIdColumnWidth),
+                columnDelimiter,
+                LocalizableStrings.VersionColumn.PadRight(versionColumnWidth),
+                columnDelimiter,
+                LocalizableStrings.CommandsColumn.PadRight(commandsColumnWidth));
+
+            yield return new string(
+                '-',
+                packageIdColumnWidth + versionColumnWidth + commandsColumnWidth + (columnDelimiter.Length * 2));
+
+            foreach (var package in packages)
+            {
+                yield return string.Format(
+                    "{0}{1}{2}{3}{4}",
+                    package.Id.ToString().PadRight(packageIdColumnWidth),
+                    columnDelimiter,
+                    package.Version.ToNormalizedString().PadRight(versionColumnWidth),
+                    columnDelimiter,
+                    GetCommandsString(package).PadRight(commandsColumnWidth));
+            }
+        }
+
+        private static bool PackageHasCommands(IToolPackage package)
+        {
+            try
+            {
+                return package.Commands.Count >= 0;
+            }
+            catch (Exception ex) when (ex is ToolConfigurationException)
+            {
+                return false;
+            }
+        }
     }
 }