diff --git a/Scalar.FunctionalTests/Categories.cs b/Scalar.FunctionalTests/Categories.cs
index 2a635caa31..2bdab7e15e 100644
--- a/Scalar.FunctionalTests/Categories.cs
+++ b/Scalar.FunctionalTests/Categories.cs
@@ -14,12 +14,6 @@ public static class Categories
 
         public static class MacTODO
         {
-            // Tests that require Config to be built
-            public const string NeedsScalarConfig = "NeedsConfig";
-
-            // Tests that require Scalar Service
-            public const string NeedsServiceVerb = "NeedsServiceVerb";
-
             // Tests requires code updates so that we lock the file instead of looking for a .lock file
             public const string TestNeedsToLockFile = "TestNeedsToLockFile";
         }
diff --git a/Scalar.FunctionalTests/Program.cs b/Scalar.FunctionalTests/Program.cs
index 2202843a65..86db0ac043 100644
--- a/Scalar.FunctionalTests/Program.cs
+++ b/Scalar.FunctionalTests/Program.cs
@@ -76,24 +76,22 @@ public static void Main(string[] args)
                 ScalarTestConfig.FileSystemRunners = FileSystemRunners.FileSystemRunner.DefaultRunners;
             }
 
-            if (runner.HasCustomArg("--windows-only"))
-            {
-                includeCategories.Add(Categories.WindowsOnly);
-
-                // RunTests unions all includeCategories.  Remove ExtraCoverage to
-                // ensure that we only run tests flagged as WindowsOnly
-                includeCategories.Remove(Categories.ExtraCoverage);
-            }
-
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                excludeCategories.Add(Categories.MacTODO.NeedsScalarConfig);
-                excludeCategories.Add(Categories.MacTODO.NeedsServiceVerb);
                 excludeCategories.Add(Categories.MacTODO.TestNeedsToLockFile);
                 excludeCategories.Add(Categories.WindowsOnly);
             }
             else
             {
+                if (runner.HasCustomArg("--windows-only"))
+                {
+                    includeCategories.Add(Categories.WindowsOnly);
+
+                    // RunTests unions all includeCategories.  Remove ExtraCoverage to
+                    // ensure that we only run tests flagged as WindowsOnly
+                    includeCategories.Remove(Categories.ExtraCoverage);
+                }
+
                 excludeCategories.Add(Categories.MacOnly);
             }
 
@@ -101,11 +99,6 @@ public static void Main(string[] args)
             // with the non-virtualized solution
             excludeCategories.Add(Categories.NeedsUpdatesForNonVirtualizedMode);
 
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                excludeCategories.Add(Categories.MacOnly);
-            }
-
             ScalarTestConfig.RepoToClone =
                 runner.GetCustomArgWithParam("--repo-to-clone")
                 ?? Properties.Settings.Default.RepoToClone;
@@ -117,7 +110,7 @@ public static void Main(string[] args)
             {
                 // Shutdown the watchman server now that the tests are complete.
                 // Allows deleting the unwatched directories.
-                ProcessHelper.Run("watchman", "shudown-server");
+                ProcessHelper.Run("watchman", "shutdown-server");
             }
             catch (Exception)
             {
diff --git a/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/ConfigVerbTests.cs b/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/ConfigVerbTests.cs
index 50e09d8f9e..e7fae1c86f 100644
--- a/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/ConfigVerbTests.cs
+++ b/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/ConfigVerbTests.cs
@@ -8,7 +8,6 @@ namespace Scalar.FunctionalTests.Tests.MultiEnlistmentTests
 {
     [TestFixture]
     [Category(Categories.ExtraCoverage)]
-    [Category(Categories.MacTODO.NeedsScalarConfig)]
     [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class ConfigVerbTests : TestsWithMultiEnlistment
     {
diff --git a/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs b/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs
index 9eee4f0956..14bcffed1b 100644
--- a/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs
+++ b/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs
@@ -91,7 +91,6 @@ public void GitObjectsRecreatedWhenDownloadingObjects()
         }
 
         [TestCase]
-        [Category(Categories.MacTODO.NeedsServiceVerb)]
         public void SecondCloneSucceedsWithMissingTrees()
         {
             string newCachePath = Path.Combine(this.localCacheParentPath, ".customScalarCache2");