diff --git a/src/chocolatey.tests.integration/scenarios/InstallScenarios.cs b/src/chocolatey.tests.integration/scenarios/InstallScenarios.cs
index 0d8fad2a7b..36e360c3af 100644
--- a/src/chocolatey.tests.integration/scenarios/InstallScenarios.cs
+++ b/src/chocolatey.tests.integration/scenarios/InstallScenarios.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017 - 2021 Chocolatey Software, Inc
+// Copyright © 2017 - 2021 Chocolatey Software, Inc
 // Copyright © 2011 - 2017 RealDimensions Software, LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -799,6 +799,7 @@ public void should_reinstall_the_same_version_of_the_package()
 
             [Fact]
             [Pending("Does not work under .Net 4.8, See issue #2690")]
+            [Broken]
             public void should_not_be_able_delete_the_rollback()
             {
                 var packageDir = Path.Combine(Scenario.get_top_level(), "lib-bkp", Configuration.PackageNames);
@@ -1285,7 +1286,7 @@ public void config_should_match_package_result_name()
                 packageResult.Name.ShouldEqual(Configuration.Input);
             }
 
-            [Fact]
+            [Fact, Pending("Current version of the NuGet client library changes this to 1.0"), Broken]
             public void should_have_a_version_of_one_dot_zero_dot_zero()
             {
                 packageResult.Version.ShouldEqual("1.0.0");
@@ -1390,6 +1391,7 @@ public void should_have_expected_error_in_package_result()
             }
         }
 
+        [Category("Side-by-Side")]
         public class when_installing_a_side_by_side_package : ScenariosBase
         {
             private PackageResult packageResult;
@@ -1431,7 +1433,7 @@ public void should_put_version_in_nupkg_filename()
                 FileAssert.Exists(packageFile);
             }
 
-            [Fact]
+            [Fact, Pending("Will be removed together with side by side removal"), Broken]
             public void should_put_version_in_nuspec_filename()
             {
                 var packageFile = Path.Combine(
@@ -1453,7 +1455,7 @@ public void should_not_have_nupkg_without_version_in_filename()
                 FileAssert.DoesNotExist(packageFile);
             }
 
-            [Fact]
+            [Fact, Pending("Broken, will be removed together with side by side install"), Broken]
             public void should_not_have_nuspec_without_version_in_filename()
             {
                 var packageFile = Path.Combine(
@@ -1523,6 +1525,7 @@ public void should_have_a_version_of_one_dot_zero_dot_zero()
             }
         }
 
+        [Category("Side-by-Side")]
         public class when_switching_a_normal_package_to_a_side_by_side_package : ScenariosBase
         {
             private PackageResult packageResult;
@@ -1566,7 +1569,7 @@ public void should_put_version_in_nupkg_filename()
                 FileAssert.Exists(packageFile);
             }
 
-            [Fact]
+            [Fact, Pending("Should be removed together with side by side installation"), Broken]
             public void should_put_version_in_nuspec_filename()
             {
                 var packageFile = Path.Combine(
@@ -1588,7 +1591,7 @@ public void should_not_have_nupkg_without_version_in_filename()
                 FileAssert.DoesNotExist(packageFile);
             }
 
-            [Fact]
+            [Fact, Pending("Should be removed together with side by side installation"), Broken]
             public void should_not_have_nuspec_without_version_in_filename()
             {
                 var packageFile = Path.Combine(
@@ -1642,6 +1645,7 @@ public void should_have_a_version_of_one_dot_zero_dot_zero()
             }
         }
 
+        [Category("Side-by-Side")]
         public class when_installing_an_older_version_side_by_side_with_a_newer_version : ScenariosBase
         {
             private PackageResult packageResult;
@@ -1687,7 +1691,7 @@ public void should_put_version_in_nupkg_filename()
                 FileAssert.Exists(packageFile);
             }
 
-            [Fact]
+            [Fact, Pending("Should be removed together with side by side installation"), Broken]
             public void should_put_version_in_nuspec_filename()
             {
                 var packageFile = Path.Combine(
@@ -1709,7 +1713,7 @@ public void should_not_have_nupkg_without_version_in_filename()
                 FileAssert.DoesNotExist(packageFile);
             }
 
-            [Fact]
+            [Fact, Pending("Should be removed together with side by side installation"), Broken]
             public void should_not_have_nuspec_without_version_in_filename()
             {
                 var packageFile = Path.Combine(
@@ -1763,7 +1767,7 @@ public void should_have_a_version_of_one_dot_one_dot_zero()
             }
         }
 
-
+        [Category("Side-by-Side")]
         public class when_switching_a_side_by_side_package_to_a_normal_package : ScenariosBase
         {
             private PackageResult packageResult;
@@ -3146,7 +3150,7 @@ public void should_not_upgrade_the_exact_version_dependency()
                 }
             }
 
-            [Fact]
+            [Fact, Broken]
             public void should_contain_a_message_that_it_was_unable_to_install_any_packages()
             {
                 bool expectedMessage = false;
@@ -3248,7 +3252,7 @@ public void should_not_downgrade_the_exact_version_dependency()
                 }
             }
 
-            [Fact]
+            [Fact, Broken]
             public void should_contain_a_message_that_it_was_unable_to_install_any_packages()
             {
                 bool expectedMessage = false;
diff --git a/src/chocolatey.tests.integration/scenarios/UninstallScenarios.cs b/src/chocolatey.tests.integration/scenarios/UninstallScenarios.cs
index 6f06c336d4..c624bfd56a 100644
--- a/src/chocolatey.tests.integration/scenarios/UninstallScenarios.cs
+++ b/src/chocolatey.tests.integration/scenarios/UninstallScenarios.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017 - 2021 Chocolatey Software, Inc
+// Copyright © 2017 - 2021 Chocolatey Software, Inc
 // Copyright © 2011 - 2017 RealDimensions Software, LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -455,6 +455,7 @@ public void should_uninstall_the_package_from_the_lib_directory()
 
             [Fact]
             [Pending("Does not work under .Net 4.8, See issue #2690")]
+            [Broken]
             public void should_not_be_able_delete_the_rollback()
             {
                 var packageDir = Path.Combine(Scenario.get_top_level(), "lib-bkp", Configuration.PackageNames);
diff --git a/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs b/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs
index 10e41abcff..221ae75c30 100644
--- a/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs
+++ b/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs
@@ -1401,6 +1401,7 @@ public void should_upgrade_the_package()
 
             [Fact]
             [Pending("Does not work under .Net 4.8, See issue #2690")]
+            [Broken]
             public void should_not_be_able_delete_the_rollback()
             {
                 var packageDir = Path.Combine(Scenario.get_top_level(), "lib-bkp", Configuration.PackageNames);
diff --git a/src/chocolatey.tests/TinySpec.cs b/src/chocolatey.tests/TinySpec.cs
index 6385838b4d..bf04bcea08 100644
--- a/src/chocolatey.tests/TinySpec.cs
+++ b/src/chocolatey.tests/TinySpec.cs
@@ -1,4 +1,4 @@
-// ==============================================================================
+// ==============================================================================
 //
 // Fervent Coder Copyright © 2011 - Released under the Apache 2.0 License
 //
@@ -147,6 +147,15 @@ public PendingAttribute(string reason)
         }
     }
 
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
+    public class BrokenAttribute : CategoryAttribute
+    {
+        public BrokenAttribute()
+            : base("Broken")
+        {
+        }
+    }
+
     public class WindowsOnlyAttribute : PlatformAttribute
     {
         public WindowsOnlyAttribute()
diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPinCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPinCommandSpecs.cs
index 41c47cf571..fbec89b3bb 100644
--- a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPinCommandSpecs.cs
+++ b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPinCommandSpecs.cs
@@ -31,6 +31,9 @@ namespace chocolatey.tests.infrastructure.app.commands
     using NuGet.Common;
     using NuGet.Packaging;
     using NuGet.Versioning;
+
+    using NUnit.Framework;
+
     using Should;
 
     public class ChocolateyPinCommandSpecs
@@ -425,7 +428,7 @@ public void should_call_nuget_service_list_run_when_command_is_list()
                 nugetService.Verify(n => n.list_run(It.IsAny<ChocolateyConfiguration>()), Times.Once);
             }
 
-            [Pending("NuGet is killing me with extension methods. Need to find proper item to mock out to return the package object.")]
+            [Pending("NuGet is killing me with extension methods. Need to find proper item to mock out to return the package object."), Category("Pending")]
             [Fact]
             public void should_set_pin_when_command_is_add()
             {
@@ -443,7 +446,7 @@ public void should_set_pin_when_command_is_add()
                 packageInfoService.Verify(s => s.save_package_information(It.IsAny<ChocolateyPackageInformation>()), Times.Once);
             }
 
-            [Pending("NuGet is killing me with extension methods. Need to find proper item to mock out to return the package object.")]
+            [Pending("NuGet is killing me with extension methods. Need to find proper item to mock out to return the package object."), Category("Pending")]
             [Fact]
             public void should_remove_pin_when_command_is_remove()
             {