diff --git a/.github/workflows/windows-build-test.yml b/.github/workflows/windows-build-test.yml
index 8c6702aa330a..beeefabc43cb 100644
--- a/.github/workflows/windows-build-test.yml
+++ b/.github/workflows/windows-build-test.yml
@@ -10,6 +10,7 @@ env:
 
 jobs:
   build_windows:
+    timeout-minutes: 30
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
@@ -324,6 +325,7 @@ jobs:
 
   test1_tests:
     needs: [build_windows] #, build_wsl]
+    timeout-minutes: 30
     runs-on: windows-latest
     steps:
 
@@ -448,50 +450,80 @@ jobs:
 #    - run: choco install gsudo
 
     - name: tests/functional/cli_root/zpool_create/zpool_create_001_pos
+      timeout-minutes: 1
       run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" create -f test01 \\?\${{github.workspace}}\test01.dat'
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" status'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" destroy -f test01'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" create -f test02 \\?\${{github.workspace}}\test01.dat \\?\${{github.workspace}}\test02.dat'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" destroy -f test02'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" create -f test03 \\?\${{github.workspace}}\test01.dat \\?\${{github.workspace}}\test02.dat \\?\${{github.workspace}}\test03.dat'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" destroy -f test03'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" create -f test04 mirror \\?\${{github.workspace}}\test01.dat \\?\${{github.workspace}}\test02.dat'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" destroy -f test04'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" create -f test05 mirror \\?\${{github.workspace}}\test01.dat \\?\${{github.workspace}}\test02.dat \\?\${{github.workspace}}\test03.dat'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" destroy -f test05'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" create -f test06 raidz \\?\${{github.workspace}}\test01.dat \\?\${{github.workspace}}\test02.dat \\?\${{github.workspace}}\test03.dat'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" destroy -f test06'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" create -f test07 raidz1 \\?\${{github.workspace}}\test01.dat \\?\${{github.workspace}}\test02.dat \\?\${{github.workspace}}\test03.dat'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
     - run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" destroy -f test07'
+      timeout-minutes: 1
     - run: Start-Sleep -Seconds 10
+      timeout-minutes: 1
 
 
 
@@ -542,6 +574,7 @@ jobs:
 
   test2_winbtrfs:
     needs: [build_windows] #, build_wsl]
+    timeout-minutes: 30
     runs-on: windows-latest
     steps:
 
@@ -705,94 +738,117 @@ jobs:
     #https://github.com/maharmstone/btrfs/blob/master/src/tests/test.cpp#L453
     - name: run winbtrfs create tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" create ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs supersede tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" supersede ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs overwrite tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" overwrite ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs open_id tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" open_id ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs io tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" io ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs mmap tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" mmap ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs rename tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" rename ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs rename_ex tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" rename_ex ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs delete tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" delete ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs delete_ex tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" delete_ex ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs links tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" links ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs links_ex tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" links_ex ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs oplock_i tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" oplock_i ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs oplock_ii tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" oplock_ii ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs oplock_batch tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" oplock_batch ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs oplock_filter tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" oplock_filter ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs oplock_r tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" oplock_r ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs oplock_rw tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" oplock_rw ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs oplock_rh tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" oplock_rh ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs oplock_rwh tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" oplock_rwh ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs cs tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" cs ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs reparse tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" reparse ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs streams tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" streams ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs ea tests
@@ -806,10 +862,12 @@ jobs:
 
     - name: run winbtrfs fileinfo tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" fileinfo ${{ steps.drive.outputs.drive }}'
 
     - name: run winbtrfs ea tests
       if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
+      timeout-minutes: 1
       run: '& "${{github.workspace}}\winbtrfs\test.exe" ea ${{ steps.drive.outputs.drive }}'
 
     #- name: run export zpool