diff --git a/tests/lsp-servers.nix b/tests/lsp-servers.nix
index 562dc8a916..c54ee84480 100644
--- a/tests/lsp-servers.nix
+++ b/tests/lsp-servers.nix
@@ -43,18 +43,10 @@ let
           "ruff_lsp"
           "bufls"
           "typst_lsp"
-          # Package ‘dotnet-core-combined’ is marked as insecure, refusing to evaluate.
-          # Dotnet SDK 6.0.428 is EOL, please use 8.0 (LTS) or 9.0 (Current)
-          # https://github.com/NixOS/nixpkgs/pull/358533
-          "dafny"
-          "fsautocomplete"
-          "omnisharp"
+
           # TODO: 2025-01-22 python312Packages.anytree is broken (dependency of bitbake-language-server)
           "bitbake_language_server"
         ]
-        ++ lib.optionals pkgs.stdenv.isDarwin [
-          "fsautocomplete"
-        ]
         ++ lib.optionals pkgs.stdenv.isAarch64 [
           # Broken
           "scheme_langserver"
@@ -63,14 +55,8 @@ let
           # TODO: 2025-01-09 python312Packages.tree-sitter (dependency of autotools-language-server) is broken
           # https://github.com/NixOS/nixpkgs/issues/372375
           "autotools_ls"
-          # Binary package not available for this architecture
-          "starpls"
           # TODO: 2024-10-05 build failure
           "fstar"
-        ]
-        ++ lib.optionals (pkgs.stdenv.hostPlatform.system == "x86_64-darwin") [
-          # Binary package not available for this architecture
-          "starpls"
         ];
     in
     {
diff --git a/tests/test-sources/plugins/by-name/dropbar/default.nix b/tests/test-sources/plugins/by-name/dropbar/default.nix
index 2eed411cec..1359b2a2e9 100644
--- a/tests/test-sources/plugins/by-name/dropbar/default.nix
+++ b/tests/test-sources/plugins/by-name/dropbar/default.nix
@@ -282,9 +282,6 @@
           };
         };
         fzf = {
-          keymaps = {
-            # TODO
-          };
           win_configs = {
             relative = "win";
             anchor = "NW";
diff --git a/tests/test-sources/plugins/by-name/efmls-configs/default.nix b/tests/test-sources/plugins/by-name/efmls-configs/default.nix
index 7bdb88f119..e99fdbd6ec 100644
--- a/tests/test-sources/plugins/by-name/efmls-configs/default.nix
+++ b/tests/test-sources/plugins/by-name/efmls-configs/default.nix
@@ -23,21 +23,7 @@
       ];
 
       brokenTools =
-        [
-          # TODO: added 2024-09-13
-          # Swift broken everywhere atm
-          "swiftformat"
-          "swiftlint"
-          # TODO: added 2024-10-15
-          # re-enable after fixed
-          "dmd"
-        ]
-        ++ lib.optionals (system == "aarch64-linux") [
-          # Broken as of 2024-07-13
-          # TODO: re-enable this tests when fixed
-          "textlint"
-        ]
-        ++ lib.optionals pkgs.stdenv.isDarwin [
+        lib.optionals pkgs.stdenv.isDarwin [
           # As of 2024-01-04, texliveMedium is broken on darwin
           # TODO: re-enable those tests when fixed
           "chktex"
@@ -48,8 +34,6 @@
           # https://github.com/NixOS/nixpkgs/pull/331373
           # TODO: re-enable this test when fixed
           "dmd"
-          # As of 2024-11-03, graalvm-ce (dependency of clj-kondo) is broken on x86_64-darwin
-          "clj_kondo"
         ];
 
       # TODO: respect unpackaged from generated
@@ -80,6 +64,8 @@
           "slim_lint"
           "solhint"
           "sorbet"
+          "swiftformat"
+          "swiftlint"
           "xo"
         ]
         ++ lib.optionals pkgs.stdenv.isDarwin [ "clazy" ]
diff --git a/tests/test-sources/plugins/by-name/lean/default.nix b/tests/test-sources/plugins/by-name/lean/default.nix
index 845efbaccc..6dfd8c63dd 100644
--- a/tests/test-sources/plugins/by-name/lean/default.nix
+++ b/tests/test-sources/plugins/by-name/lean/default.nix
@@ -1,12 +1,4 @@
-{ lib, pkgs, ... }:
-let
-  platform = pkgs.stdenv.hostPlatform;
-
-  # TODO: `cadical`, one of `lean4`'s dependencies is broken on x86_64-darwin
-  # https://github.com/NixOS/nixpkgs/pull/371275
-  doRun = !(platform.isDarwin && platform.isx86_64);
-in
-lib.optionalAttrs doRun {
+{
   empty = {
     plugins.lean.enable = true;
   };
diff --git a/tests/test-sources/plugins/by-name/neoclip/default.nix b/tests/test-sources/plugins/by-name/neoclip/default.nix
index da1e02ce39..feb28e4078 100644
--- a/tests/test-sources/plugins/by-name/neoclip/default.nix
+++ b/tests/test-sources/plugins/by-name/neoclip/default.nix
@@ -4,10 +4,6 @@
   };
 
   with-sqlite = {
-    # TODO: added 2024-09-13
-    # re-enable when sqlite fixed
-    test.runNvim = false;
-
     plugins = {
       sqlite-lua.enable = true;
       neoclip = {
diff --git a/tests/test-sources/plugins/by-name/neotest/dart.nix b/tests/test-sources/plugins/by-name/neotest/dart.nix
index fcff2917ec..707d8c91ec 100644
--- a/tests/test-sources/plugins/by-name/neotest/dart.nix
+++ b/tests/test-sources/plugins/by-name/neotest/dart.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/default.nix b/tests/test-sources/plugins/by-name/neotest/default.nix
index 61e1c2b4a0..60ccbb22b8 100644
--- a/tests/test-sources/plugins/by-name/neotest/default.nix
+++ b/tests/test-sources/plugins/by-name/neotest/default.nix
@@ -1,14 +1,9 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins.neotest.enable = true;
   };
 
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  all-adapters = lib.mkIf pkgs.stdenv.isLinux {
+  all-adapters = {
     plugins = {
       treesitter.enable = true;
       neotest = {
@@ -48,9 +43,7 @@
     };
   };
 
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  defaults = lib.mkIf pkgs.stdenv.isLinux {
+  defaults = {
     plugins.neotest = {
       enable = true;
 
diff --git a/tests/test-sources/plugins/by-name/neotest/dotnet.nix b/tests/test-sources/plugins/by-name/neotest/dotnet.nix
index 06ba6b171b..f65b36cf12 100644
--- a/tests/test-sources/plugins/by-name/neotest/dotnet.nix
+++ b/tests/test-sources/plugins/by-name/neotest/dotnet.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/elixir.nix b/tests/test-sources/plugins/by-name/neotest/elixir.nix
index 367ffbe66c..45988bad96 100644
--- a/tests/test-sources/plugins/by-name/neotest/elixir.nix
+++ b/tests/test-sources/plugins/by-name/neotest/elixir.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/foundry.nix b/tests/test-sources/plugins/by-name/neotest/foundry.nix
index 56e41cab97..f899311787 100644
--- a/tests/test-sources/plugins/by-name/neotest/foundry.nix
+++ b/tests/test-sources/plugins/by-name/neotest/foundry.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/go.nix b/tests/test-sources/plugins/by-name/neotest/go.nix
index fe58f23227..ebba1fdf2e 100644
--- a/tests/test-sources/plugins/by-name/neotest/go.nix
+++ b/tests/test-sources/plugins/by-name/neotest/go.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/golang.nix b/tests/test-sources/plugins/by-name/neotest/golang.nix
index d047404639..6ac513180a 100644
--- a/tests/test-sources/plugins/by-name/neotest/golang.nix
+++ b/tests/test-sources/plugins/by-name/neotest/golang.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/gtest.nix b/tests/test-sources/plugins/by-name/neotest/gtest.nix
index 57d38b2c3d..f6bcd6022a 100644
--- a/tests/test-sources/plugins/by-name/neotest/gtest.nix
+++ b/tests/test-sources/plugins/by-name/neotest/gtest.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     # We cannot test neotest-gtest as it tries to create file in the upper directory
     # https://github.com/alfaix/neotest-gtest/blob/6e794ac91f4c347e2ea5ddeb23d594f8fc64f2a8/lua/neotest-gtest/utils.lua#L10-L16
     test.runNvim = false;
diff --git a/tests/test-sources/plugins/by-name/neotest/haskell.nix b/tests/test-sources/plugins/by-name/neotest/haskell.nix
index 22f35bf5a3..0b37e762af 100644
--- a/tests/test-sources/plugins/by-name/neotest/haskell.nix
+++ b/tests/test-sources/plugins/by-name/neotest/haskell.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/java.nix b/tests/test-sources/plugins/by-name/neotest/java.nix
index 24cf2902ee..f279ceb08b 100644
--- a/tests/test-sources/plugins/by-name/neotest/java.nix
+++ b/tests/test-sources/plugins/by-name/neotest/java.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/jest.nix b/tests/test-sources/plugins/by-name/neotest/jest.nix
index 0f0392854c..b02ce6bd51 100644
--- a/tests/test-sources/plugins/by-name/neotest/jest.nix
+++ b/tests/test-sources/plugins/by-name/neotest/jest.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/minitest.nix b/tests/test-sources/plugins/by-name/neotest/minitest.nix
index 245d136d2f..8e90fd44a2 100644
--- a/tests/test-sources/plugins/by-name/neotest/minitest.nix
+++ b/tests/test-sources/plugins/by-name/neotest/minitest.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/pest.nix b/tests/test-sources/plugins/by-name/neotest/pest.nix
index e87f55fdf9..5b3d027653 100644
--- a/tests/test-sources/plugins/by-name/neotest/pest.nix
+++ b/tests/test-sources/plugins/by-name/neotest/pest.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/phpunit.nix b/tests/test-sources/plugins/by-name/neotest/phpunit.nix
index 0686d876ac..a7ef6db89e 100644
--- a/tests/test-sources/plugins/by-name/neotest/phpunit.nix
+++ b/tests/test-sources/plugins/by-name/neotest/phpunit.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/playwright.nix b/tests/test-sources/plugins/by-name/neotest/playwright.nix
index da6b589f5c..f8ad74dd9f 100644
--- a/tests/test-sources/plugins/by-name/neotest/playwright.nix
+++ b/tests/test-sources/plugins/by-name/neotest/playwright.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/plenary.nix b/tests/test-sources/plugins/by-name/neotest/plenary.nix
index 31f60cd3ea..4cd5f293ce 100644
--- a/tests/test-sources/plugins/by-name/neotest/plenary.nix
+++ b/tests/test-sources/plugins/by-name/neotest/plenary.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/python.nix b/tests/test-sources/plugins/by-name/neotest/python.nix
index 1da08ba271..62158048f7 100644
--- a/tests/test-sources/plugins/by-name/neotest/python.nix
+++ b/tests/test-sources/plugins/by-name/neotest/python.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/rspec.nix b/tests/test-sources/plugins/by-name/neotest/rspec.nix
index c789ad9dc3..6d2b549eed 100644
--- a/tests/test-sources/plugins/by-name/neotest/rspec.nix
+++ b/tests/test-sources/plugins/by-name/neotest/rspec.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  defaults = lib.mkIf pkgs.stdenv.isLinux {
+  defaults = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/rust.nix b/tests/test-sources/plugins/by-name/neotest/rust.nix
index db3b78c112..098e2be59c 100644
--- a/tests/test-sources/plugins/by-name/neotest/rust.nix
+++ b/tests/test-sources/plugins/by-name/neotest/rust.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/scala.nix b/tests/test-sources/plugins/by-name/neotest/scala.nix
index 8c42b4ef41..47d66af228 100644
--- a/tests/test-sources/plugins/by-name/neotest/scala.nix
+++ b/tests/test-sources/plugins/by-name/neotest/scala.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/neotest/vitest.nix b/tests/test-sources/plugins/by-name/neotest/vitest.nix
index 45b50fab24..df8b6890ef 100644
--- a/tests/test-sources/plugins/by-name/neotest/vitest.nix
+++ b/tests/test-sources/plugins/by-name/neotest/vitest.nix
@@ -1,8 +1,5 @@
-{ lib, pkgs, ... }:
 {
-  # TODO: added 2024-09-15
-  # TODO: Re-enable when upstream builds in darwin sandbox
-  example = lib.mkIf pkgs.stdenv.isLinux {
+  example = {
     plugins = {
       treesitter.enable = true;
       neotest = {
diff --git a/tests/test-sources/plugins/by-name/none-ls/default.nix b/tests/test-sources/plugins/by-name/none-ls/default.nix
index 9850082b0f..645e67387b 100644
--- a/tests/test-sources/plugins/by-name/none-ls/default.nix
+++ b/tests/test-sources/plugins/by-name/none-ls/default.nix
@@ -4,16 +4,6 @@
     plugins.none-ls.enable = true;
   };
 
-  # Broken:
-  # error: The option `plugins.none-ls.sources.formatting.beautysh' does not exist.
-  #
-  # beautysh = {
-  #   plugins.none-ls = {
-  #     enable = true;
-  #     sources.formatting.beautysh.enable = true;
-  #   };
-  # };
-
   with-lsp-format = {
     plugins = {
       lsp.enable = true;
@@ -105,48 +95,20 @@
       pkgs,
       ...
     }:
+    let
+      inherit (pkgs.stdenv) hostPlatform;
+    in
     {
       plugins.none-ls = {
         # sandbox-exec: pattern serialization length 159032 exceeds maximum (65535)
-        enable = !pkgs.stdenv.isDarwin;
+        enable = !hostPlatform.isDarwin;
 
         sources =
           let
-            disabled =
-              [
-                # TODO: added 2024-09-13
-                # Swift broken everywhere atm
-                "swiftformat"
-                "swift_format"
-                "swiftlint"
-                # TODO: added 2024-10-15
-                # broken package
-                "opacheck"
-                "rego"
-                "prisma_format"
-              ]
-              ++ (lib.optionals pkgs.stdenv.isDarwin [
-                # As of 2024-05-22, python311Packages.k5test (one of ansible-lint's dependenvies) is broken on darwin
-                # TODO: re-enable this test when fixed
-                "ansible_lint"
-                "clazy"
-                "gdformat"
-                "gdlint"
-                "haml_lint"
-                # As of 2024-06-29, pkgs.rubyfmt is broken on darwin
-                # TODO: re-enable this test when fixed
-                "rubyfmt"
-                "verilator"
-                "verible_verilog_format"
-              ])
-              ++ (lib.optionals (pkgs.stdenv.isDarwin && pkgs.stdenv.isx86_64) [
-                # As of 2024-11-03, graalvm-ce (dependency of clj-kondo) is broken on x86_64-darwin
-                "clj_kondo"
-              ])
-              ++ (lib.optionals pkgs.stdenv.isAarch64 [
-                "semgrep"
-                "smlfmt"
-              ]);
+            disabled = lib.optionals (hostPlatform.isLinux && hostPlatform.isAarch64) [
+              # Not available on aarch64-linux
+              "smlfmt"
+            ];
           in
           # Enable every none-ls source that has an option
           lib.mapAttrs (
diff --git a/tests/test-sources/plugins/by-name/treesitter/default.nix b/tests/test-sources/plugins/by-name/treesitter/default.nix
index 37c2edd683..2e079f3490 100644
--- a/tests/test-sources/plugins/by-name/treesitter/default.nix
+++ b/tests/test-sources/plugins/by-name/treesitter/default.nix
@@ -82,8 +82,6 @@
   };
 
   no-nix = {
-    # TODO: See if we can build parsers (legacy way)
-    test.runNvim = false;
     plugins.treesitter = {
       enable = true;
       nixGrammars = false;
diff --git a/tests/test-sources/plugins/by-name/yanky/default.nix b/tests/test-sources/plugins/by-name/yanky/default.nix
index 84910b7873..736f98d9ba 100644
--- a/tests/test-sources/plugins/by-name/yanky/default.nix
+++ b/tests/test-sources/plugins/by-name/yanky/default.nix
@@ -60,10 +60,6 @@
   };
 
   example = {
-    # TODO: added 2024-09-13
-    # re-enable when sqlite fixed
-    test.runNvim = false;
-
     plugins = {
       sqlite-lua.enable = true;
       telescope.enable = true;