diff --git a/roles/neovim/files/nvim/ftplugin/java.lua b/roles/neovim/files/nvim/ftplugin/java.lua
index 66f2a47..256d8e1 100644
--- a/roles/neovim/files/nvim/ftplugin/java.lua
+++ b/roles/neovim/files/nvim/ftplugin/java.lua
@@ -1,12 +1,15 @@
 vim.opt_local.autoindent = true
-vim.opt_local.expandtab = false
-vim.opt_local.shiftwidth = 4
-vim.opt_local.tabstop = 4
-vim.opt_local.softtabstop = 4
+vim.opt_local.expandtab = true
+vim.opt_local.shiftwidth = 2
+vim.opt_local.tabstop = 2
+vim.opt_local.softtabstop = 2
 
-local jdtls_dir = os.getenv("HOME") .. "/dev/eclipse.jdt.ls/org.eclipse.jdt.ls.product/target/repository"
-local java_debug_plugin = os.getenv("HOME") ..
-"/dev/java-debug/com.microsoft.java.debug.plugin/target/com.microsoft.java.debug.plugin-0.53.0.jar"
+local base_dir = os.getenv("HOME") .. "/dev"
+local jdtls_dir = base_dir .. "/eclipse.jdt.ls/org.eclipse.jdt.ls.product/target/repository"
+local bundles = {
+  vim.fn.glob(base_dir .. "/java-debug/com.microsoft.java.debug.plugin/target/com.microsoft.java.debug.plugin-*.jar", true),
+};
+vim.list_extend(bundles, vim.split(vim.fn.glob(base_dir .. "/vscode-java-test/server/*.jar", true), "\n"))
 
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
 capabilities = {
@@ -34,9 +37,7 @@ local config = {
   capabilities = capabilities,
   on_attach = require("inkatze.lspconfig").on_attach,
   init_options = {
-    bundles = {
-      vim.fn.glob(java_debug_plugin, true)
-    },
+    bundles = bundles,
   }
 }
 
diff --git a/roles/neovim/files/nvim/lazy-lock.json b/roles/neovim/files/nvim/lazy-lock.json
index cff04c2..b89a6e2 100644
--- a/roles/neovim/files/nvim/lazy-lock.json
+++ b/roles/neovim/files/nvim/lazy-lock.json
@@ -2,7 +2,7 @@
   "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
   "barbar.nvim": { "branch": "master", "commit": "d181f2cfd4b828f9c6f1e10e69c68241de59f54f" },
   "beacon.nvim": { "branch": "master", "commit": "098ff96c33874339d5e61656f3050dbd587d6bd5" },
-  "catppuccin": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" },
+  "catppuccin": { "branch": "main", "commit": "2d3419c2aead379b7d1854d32458f20ffaa58562" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-fish": { "branch": "main", "commit": "3a23492e2aead05522a9887ec685d70e8c987323" },
@@ -10,35 +10,36 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
   "copilot.vim": { "branch": "release", "commit": "0668308e68b0ac28b332b204b469fbe04601536a" },
-  "elixir-tools.nvim": { "branch": "main", "commit": "ab10b425a4d4b34447b0699bd93aa42f97bdf4b5" },
-  "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
-  "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" },
+  "elixir-tools.nvim": { "branch": "main", "commit": "66ccac7b9fc8c5305e24a2edbd701f0ed0a30442" },
+  "fidget.nvim": { "branch": "main", "commit": "c12f8a58ee472ce5983c3a3f3aad0ff6c49a6a83" },
+  "gitsigns.nvim": { "branch": "main", "commit": "220446c8c86a280180d852efac60991eaf1a21d4" },
   "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
-  "lazy.nvim": { "branch": "main", "commit": "a9d7ade203b3f3ee3058c082c62afdf8e4bcb416" },
+  "lazy.nvim": { "branch": "main", "commit": "1870238cf9c579c5d7eb8ea8b296f10b81978d34" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
+  "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" },
   "neotest": { "branch": "master", "commit": "26ed90509c377d10dbdebd25b7094a886323b32b" },
   "neotest-elixir": { "branch": "master", "commit": "c5067bcc3ec6a0bba7b5694fa15aeb17f16aeb3c" },
+  "neotest-java": { "branch": "main", "commit": "ce8b10e4e4f670b6f79224139053679864fa810b" },
   "neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" },
   "neotest-rspec": { "branch": "main", "commit": "48573d5882cbe8d8bcd3b735d9ee7705168b1b87" },
   "nvim-ansible": { "branch": "main", "commit": "7b1b994e4267b4c99045ef2798f7c12f326c2247" },
-  "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
+  "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" },
   "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
   "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
   "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" },
   "nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" },
-  "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" },
   "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
   "nvim-tree.lua": { "branch": "master", "commit": "59e65d88db177ad1e6a8cffaafd4738420ad20b6" },
-  "nvim-treesitter": { "branch": "master", "commit": "ffd7725102f47e7391d7a5e7621d178689602a52" },
+  "nvim-treesitter": { "branch": "master", "commit": "ebdffa78bdb16af84fb76ff6a75978496d4dcbec" },
   "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "trouble.nvim": { "branch": "main", "commit": "e5d0e04121c662ce29190a57dd03655d43c59d44" },
+  "trouble.nvim": { "branch": "main", "commit": "4453fea6bb597830fbd58d2c484612f37b97bd8c" },
   "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" },
   "vim-projectionist": { "branch": "master", "commit": "3736bd4a5f23b30821cbb892385bb1f1b0088cfc" },
   "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
-  "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }
+  "which-key.nvim": { "branch": "main", "commit": "af4ded85542d40e190014c732fa051bdbf88be3d" }
 }
\ No newline at end of file
diff --git a/roles/neovim/files/nvim/lua/plugins/neotest.lua b/roles/neovim/files/nvim/lua/plugins/neotest.lua
index ebfe468..fd1eeca 100644
--- a/roles/neovim/files/nvim/lua/plugins/neotest.lua
+++ b/roles/neovim/files/nvim/lua/plugins/neotest.lua
@@ -1,15 +1,16 @@
 return {
   "nvim-neotest/neotest",
-  ft = { "ruby", "elixir", "javascript", "javascriptreact", "typescript", "typescriptreact" },
+  ft = { "ruby", "elixir", "javascript", "javascriptreact", "typescript", "typescriptreact", "java" },
   dependencies = {
-    { "nvim-neotest/nvim-nio", lazy = true},
-    { "nvim-lua/plenary.nvim",   lazy = true },
+    { "nvim-neotest/nvim-nio",           lazy = true },
+    { "nvim-lua/plenary.nvim",           lazy = true },
     { "antoinemadec/FixCursorHold.nvim", lazy = true },
     { "nvim-treesitter/nvim-treesitter", lazy = true },
-    { "olimorris/neotest-rspec",  lazy = true },
-    { "jfpedroza/neotest-elixir", lazy = true },
-    { "haydenmeade/neotest-jest", lazy = true },
-    { "folke/which-key.nvim",     lazy = true },
+    { "olimorris/neotest-rspec",         lazy = true },
+    { "jfpedroza/neotest-elixir",        lazy = true },
+    { "haydenmeade/neotest-jest",        lazy = true },
+    { "folke/which-key.nvim",            lazy = true },
+    { "rcasia/neotest-java",             lazy = true },
   },
   config = function()
     require("neotest").setup({
@@ -24,6 +25,9 @@ return {
             return vim.fn.getcwd()
           end,
         }),
+        require("neotest-java")({
+          ignore_wrapper = false,
+        }),
       },
     })
 
diff --git a/roles/neovim/files/nvim/lua/plugins/nvim-dap.lua b/roles/neovim/files/nvim/lua/plugins/nvim-dap.lua
index a0439a4..e931e68 100644
--- a/roles/neovim/files/nvim/lua/plugins/nvim-dap.lua
+++ b/roles/neovim/files/nvim/lua/plugins/nvim-dap.lua
@@ -19,13 +19,13 @@ return {
     dap.listeners.before.launch.dapui_config = function()
       dapui.open()
     end
-    dap.listeners.after.event_terminated.dapui_config = function()
+    dap.listeners.before.event_terminated.dapui_config = function()
       dapui.close()
     end
-    dap.listeners.after.event_exited.dapui_config = function()
+    dap.listeners.before.event_exited.dapui_config = function()
       dapui.close()
     end
-    dap.listeners.after.event_stopped.dapui_config = function()
+    dap.listeners.before.event_stopped.dapui_config = function()
       dapui.close()
     end
 
@@ -54,7 +54,7 @@ return {
         s = { function()
           widgets.centered_float(widgets.scopes)
         end, "show scopes in floating screen", opts },
-        t = { dap.terminate, "terminate", opts },
+        t = {dap.terminate, "terminate", opts },
       },
     }, { prefix = "<leader>" })
   end,