diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 14071db..c3c2bd8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,6 +35,8 @@ jobs:
           mise list-all android-sdk
           mise install android-sdk@13.0
           mise exec android-sdk@13.0 -- sdkmanager --version
+          echo y | mise exec android-sdk@13.0 -- sdkmanager platform-tools
+          mise exec android-sdk@13.0 -- adb version
 
   unit-test:
     runs-on: ubuntu-latest
diff --git a/hooks/env_keys.lua b/hooks/env_keys.lua
index 6b4ef47..807daf6 100644
--- a/hooks/env_keys.lua
+++ b/hooks/env_keys.lua
@@ -11,7 +11,7 @@ function PLUGIN:EnvKeys(ctx)
     -- Structure is: install_path/cmdline-tools/VERSION/bin
     local bin_path = file.join_path(install_path, "cmdline-tools", version, "bin")
 
-    return {
+    local env_vars = {
         {
             key = "PATH",
             value = bin_path,
@@ -25,4 +25,18 @@ function PLUGIN:EnvKeys(ctx)
             value = install_path,
         },
     }
+
+    -- Add tools installed with sdkmanager to PATH, if they exist
+    local optional_bin_paths = { "platform-tools", "emulator" }
+    for _, relative_optional_bin_path in ipairs(optional_bin_paths) do
+        local optional_bin_path = file.join_path(install_path, relative_optional_bin_path)
+        if file.exists(optional_bin_path) then
+            table.insert(env_vars, {
+                key = "PATH",
+                value = optional_bin_path,
+            })
+        end
+    end
+
+    return env_vars
 end