diff --git a/lua/custom/plugins/jester.lua b/lua/custom/plugins/jester.lua
deleted file mode 100644
index adc8ed3c..00000000
--- a/lua/custom/plugins/jester.lua
+++ /dev/null
@@ -1,48 +0,0 @@
-return {
-  {
-    'David-Kunz/jester',
-    config = function()
-      local jester = require 'jester'
-      require('which-key').register({
-        j = {
-          name = '[J]ester',
-          s = {
-            name = '[S]ingle test',
-          },
-          f = {
-            name = '[F]ile test',
-          },
-          ['1'] = 'which_key_ignore',
-        },
-      }, { prefix = '<leader>' })
-
-      jester.setup {
-        cmd = "npm t -- -t '$result' $file",
-        identifiers = { 'test', 'it' },
-        prepend = { 'describe' },
-        expressions = { 'call_expression' },
-        path_to_jest_run = 'jest',
-        path_to_jest_debug = './node_modules/.bin/jest',
-        terminal_cmd = ':vsplit | terminal',
-        dap = {
-          type = 'pwa-node',
-          request = 'launch',
-          cwd = vim.fn.getcwd(),
-          runtimeArgs = { '--inspect-brk', '~/n/bin/npm', 't', '--', '--no-coverage', '-t', '$result', '--', '$file' },
-          args = { '--no-cache' },
-          sourceMaps = false,
-          protocol = 'inspector',
-          skipFiles = { '<node_internals>/**/*.js' },
-          console = 'integratedTerminal',
-          port = 9229,
-          disableOptimisticBPs = true,
-        },
-      }
-
-      vim.keymap.set('n', '<leader>jsr', jester.run, { desc = 'Single test Run' })
-      vim.keymap.set('n', '<leader>jsd', jester.debug, { desc = 'Single test debug' })
-      vim.keymap.set('n', '<leader>jfr', jester.run, { desc = 'File test Run' })
-      vim.keymap.set('n', '<leader>jfd', jester.debug, { desc = 'File test debug' })
-    end,
-  },
-}
diff --git a/lua/custom/plugins/neotest.lua b/lua/custom/plugins/neotest.lua
new file mode 100644
index 00000000..01003bbc
--- /dev/null
+++ b/lua/custom/plugins/neotest.lua
@@ -0,0 +1,49 @@
+return {
+  'nvim-neotest/neotest',
+  dependencies = {
+    'nvim-neotest/nvim-nio',
+    'nvim-lua/plenary.nvim',
+    'antoinemadec/FixCursorHold.nvim',
+    'nvim-treesitter/nvim-treesitter',
+    'nvim-neotest/neotest-jest',
+  },
+  config = function()
+    local neotest = require 'neotest'
+
+    neotest.setup {
+      discovery = {
+        enabled = false,
+      },
+      adapters = {
+        require 'neotest-jest' {
+          jestCommand = 'npm t --',
+          jest_test_discovery = false,
+          -- jestConfigFile = 'custom.jest.config.ts',
+          -- env = { CI = true },
+          cwd = function(path)
+            return vim.fn.getcwd()
+          end,
+        },
+      },
+    }
+
+    vim.keymap.set('n', '<leader>jsr', neotest.run.run, { desc = 'Single test Run' })
+    vim.keymap.set('n', '<leader>jsd', function()
+      neotest.run.run { strategy = 'dap' }
+    end, { desc = 'Single test debug' })
+    vim.keymap.set('n', '<leader>jfr', function()
+      neotest.run.run(vim.fn.expand '%')
+    end, { desc = 'File test Run' })
+    vim.keymap.set('n', '<leader>jfd', function()
+      neotest.run.run {
+        vim.fn.expand '%',
+        strategy = 'dap',
+      }
+    end, { desc = 'File test debug' })
+    vim.keymap.set('n', '<leader>jo', function()
+      neotest.output.open { enter = true }
+    end, { desc = 'Open test result output' })
+    vim.keymap.set('n', '<leader>jp', neotest.output_panel.toggle, { desc = 'Toggle test result output tree' })
+    vim.keymap.set('n', '<leader>jr', neotest.summary.toggle, { desc = 'Toggle test summary' })
+  end,
+}
diff --git a/lua/custom/plugins/spellcheck.lua b/lua/custom/plugins/spellcheck.lua
index 49698493..7fefd407 100644
--- a/lua/custom/plugins/spellcheck.lua
+++ b/lua/custom/plugins/spellcheck.lua
@@ -10,7 +10,6 @@ return {
         diagnostic.severity = vim.diagnostic.severity['HINT']
       end,
       config = {
-        config_file_preferred_name = 'config.json',
         cspell_config_dirs = { '~/.config/cspell/' },
         on_add_to_json = function(payload)
           os.execute(