diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml
index 93f8eb5772..fd11977b20 100644
--- a/.github/workflows/falcor-test.yml
+++ b/.github/workflows/falcor-test.yml
@@ -9,6 +9,7 @@ on:
       - "LICENSE"
       - "CONTRIBUTING.md"
       - "README.md"
+  workflow_dispatch:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -28,7 +29,7 @@ jobs:
           - warnings-as-errors: true
             test-category: full
             full-gpu-tests: false
-            runs-on: [Windows, self-hosted, falcor]
+            runs-on: [Windows, self-hosted, falcordbg]
     runs-on: ${{ matrix.runs-on }}
     defaults:
       run:
@@ -52,6 +53,7 @@ jobs:
           mkdir FalcorBin
           cd FalcorBin
           Copy-Item -Path 'C:\Falcor\build\windows-vs2022\bin' -Destination '.\build\windows-vs2022\bin' -Recurse -Exclude ("*.pdb")
+          Copy-Item -Path 'C:\Falcor\.git' -Destination '.\' -Recurse
           Copy-Item -Path 'C:\Falcor\tests' -Destination '.\' -Recurse
           Copy-Item -Path 'C:\Falcor\tools' -Destination '.\' -Recurse
           Copy-Item -Path 'C:\Falcor\media' -Destination '.\' -Recurse
@@ -74,10 +76,34 @@ jobs:
       - name: falcor-unit-test
         shell: pwsh
         run: |
-          $ErrorActionPreference = "SilentlyContinue"
+          $ErrorActionPreference = "Continue"
+          Write-Host "=== Listing FalcorBin structure ==="
+          Get-ChildItem -Recurse -Force .\FalcorBin | Where-Object { $_.Extension -eq ".exe" -or $_.Extension -eq ".dll" -or $_.Name -eq ".git" } | Select-Object FullName
+          Write-Host "=== Checking for FalcorTest.exe ==="
+          Get-ChildItem -Recurse .\FalcorBin\build -Filter "FalcorTest.exe" -ErrorAction SilentlyContinue | Select-Object FullName
+          Write-Host "=== Checking .git directory ==="
+          Test-Path .\FalcorBin\.git
+          Write-Host "=== Running unit tests ==="
           cd .\FalcorBin\tests
-          python ./testing/run_unit_tests.py --config windows-vs2022-Release -t "-slow"
+          Write-Host "Command: python -u ./testing/run_unit_tests.py --config windows-vs2022-Release --tags=`"-slow`""
+          Write-Host "Working directory: $PWD"
+          $env:PYTHONUNBUFFERED = "1"
+          python -u ./testing/run_unit_tests.py --config windows-vs2022-Release --tags="-slow" 2>&1 | Tee-Object -Variable output
+          $exitCode = $LASTEXITCODE
+          Write-Host "Exit code: $exitCode"
+          Write-Host "Output length: $($output.Length) lines"
           cd ../../
+          if ($exitCode -ne 0) { exit $exitCode }
+      - name: Copy FalcorBin for debugging
+        if: always()
+        shell: pwsh
+        run: |
+          $timestamp = Get-Date -Format "yyyy-MM-dd_HH-mm-ss"
+          $debugDir = "C:\FalcorDebug\$timestamp"
+          Write-Host "Copying FalcorBin to $debugDir for debugging"
+          New-Item -ItemType Directory -Force -Path $debugDir
+          Copy-Item -Path .\FalcorBin -Destination $debugDir -Recurse -Force
+          Write-Host "Debug copy saved to: $debugDir"
       - name: falcor-image-test
         shell: pwsh
         run: |