diff --git a/.config/nvim/lua/plugins/extras/dap/core.lua b/.config/nvim/lua/plugins/extras/dap/core.lua
index ee9a5b80..2ecf1689 100644
--- a/.config/nvim/lua/plugins/extras/dap/core.lua
+++ b/.config/nvim/lua/plugins/extras/dap/core.lua
@@ -22,6 +22,14 @@ return {
       { "<S-F2>", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" },
     },
   },
+  {
+    "nvim-neotest/neotest",
+    optional = true,
+    -- stylua: ignore
+    keys = {
+      { "<leader>tL", function() require("neotest").run.run_last({ strategy = "dap" }) end, desc = "Debug Last Test" },
+    },
+  },
   {
     "folke/which-key.nvim",
     opts = {
diff --git a/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua b/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua
index e8bd04f6..ca3a4669 100644
--- a/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua
+++ b/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua
@@ -141,6 +141,10 @@ return {
         ["neotest-vitest"] = {},
       },
     },
+    -- stylua: ignore
+    keys = {
+      { "<leader>tw", function() require('neotest').run.run({ jestCommand = 'jest --watch ' }) end, desc = "Run Watch" },
+    },
   },
   {
     "luckasRanarison/nvim-devdocs",
diff --git a/.config/nvim/lua/plugins/extras/test/core.lua b/.config/nvim/lua/plugins/extras/test/core.lua
index f0def530..6e25a488 100644
--- a/.config/nvim/lua/plugins/extras/test/core.lua
+++ b/.config/nvim/lua/plugins/extras/test/core.lua
@@ -1,14 +1,5 @@
 return {
   { import = "lazyvim.plugins.extras.test.core" },
-  {
-    "nvim-neotest/neotest",
-  -- stylua: ignore
-  keys = {
-    { "<leader>tl", function() require("neotest").run.run_last() end, desc = "Run Last Test" },
-    { "<leader>tL", function() require("neotest").run.run_last({ strategy = "dap" }) end, desc = "Debug Last Test" },
-    { "<leader>tw", "<cmd>lua require('neotest').run.run({ jestCommand = 'jest --watch ' })<cr>", desc = "Run Watch" },
-  },
-  },
   {
     "folke/which-key.nvim",
     opts = {