diff --git a/.github/workflows/mobsf-test.yml b/.github/workflows/mobsf-test.yml
index b80fcc994..ecdd4e2f8 100644
--- a/.github/workflows/mobsf-test.yml
+++ b/.github/workflows/mobsf-test.yml
@@ -69,12 +69,22 @@ jobs:
     - name: Windows debug
       if: startsWith(matrix.os, 'windows')
       run: |
-        JAVA_HOME="${JAVA_HOME_21_X64}" ~/.MobSF/tools/jadx/jadx-1.5.0/bin/jadx.bat
+        set JAVA_HOME=%JAVA_HOME_21_X64%
+        if "%JAVA_HOME%"=="" (
+            echo JAVA_HOME_21_X64 is not set. Please ensure that the JAVA_HOME_21_X64 variable is defined.
+            exit /b 1
+        )
+        set PATH=%JAVA_HOME%\bin;%PATH%
+        echo JAVA_HOME is set to %JAVA_HOME%
+        echo PATH is updated with JAVA_HOME\bin
+
+        java -version
+        ~/.MobSF/tools/jadx/jadx-1.5.0/bin/jadx.bat
 
     - name: Unit Tests on Ubuntu, macOS and Windows
       run: |
         git submodule update --init --recursive
-        JAVA_HOME="${JAVA_HOME_21_X64}" poetry run python manage.py test mobsf
+        poetry run python manage.py test mobsf
 
     - name: Python Package Test in Ubuntu and macOS
       if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macOS')