diff --git a/.github/workflows/ci-browserstack.yml b/.github/workflows/ci-browserstack.yml
index 7c49cb3..e5b34af 100644
--- a/.github/workflows/ci-browserstack.yml
+++ b/.github/workflows/ci-browserstack.yml
@@ -37,7 +37,6 @@ jobs:
         run: |
           export ANDROID_HOME=$HOME/android-sdk
           export ANDROID_SDK_ROOT=$HOME/android-sdk
-          export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools
           
           mkdir -p $ANDROID_HOME
           cd $ANDROID_HOME
@@ -49,6 +48,19 @@ jobs:
           mv cmdline-tools/* latest/ 2>/dev/null || true
           mv latest cmdline-tools/ 2>/dev/null || true
           
+          # Set PATH for sdkmanager
+          export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin
+          
+          # Verify sdkmanager is accessible
+          if ! command -v sdkmanager &> /dev/null; then
+            echo "sdkmanager not found, trying direct path..."
+            $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --version || {
+              echo "ERROR: sdkmanager still not found"
+              ls -la $ANDROID_HOME/cmdline-tools/latest/bin/ || echo "Directory doesn't exist"
+              exit 1
+            }
+          fi
+          
           # Accept licenses
           yes | sdkmanager --licenses > /dev/null 2>&1 || true