diff --git a/.github/workflows/windows-build-test.yml b/.github/workflows/windows-build-test.yml
index 6664cff60aef..e17a96afdf62 100644
--- a/.github/workflows/windows-build-test.yml
+++ b/.github/workflows/windows-build-test.yml
@@ -2329,244 +2329,5 @@ jobs:
 
 
 
-    #- name: run winbtrfs tests
-    #  run: '& "${{github.workspace}}\winbtrfs\test.exe" ${{ steps.drive.outputs.drive }}'
-
-    - name: test dummy status step
-      id: dummy
-      run: exit 0
-
-    - name: debug - dummy status
-      run: echo ${{ steps.dummy.conclusion }}
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    #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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    #- name: run winbtrfs ea tests
-    #  if: ${{ ( success() || failure() ) && steps.dummy.conclusion == 'success' }}
-    #  run: '& "${{github.workspace}}\winbtrfs\test.exe" ea ${{ steps.drive.outputs.drive }}'
-
-    - 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 }}'
-
-    - run: Start-Sleep -Seconds 10
-      timeout-minutes: 1
-
-    - 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
-    #  if: ${{ always() }}
-    #  timeout-minutes: 1
-    #  run: '& "C:\Program Files\OpenZFS On Windows\zpool.exe" export tank'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
diff --git a/contrib/windows/tests/btrfstests.py b/contrib/windows/tests/btrfstests.py
index c2d5773dc530..7ab7b8a59b00 100644
--- a/contrib/windows/tests/btrfstests.py
+++ b/contrib/windows/tests/btrfstests.py
@@ -216,15 +216,14 @@ def main():
 
 
 
-
-        preTest("create tests:")
-        f = PureWindowsPath(get_driveletters()[0][1])
-        ret = runWithPrint([str(p.joinpath("winbtrfs", "test.exe")), "create", str(f)])
-        time.sleep(10)
-        if ret.returncode != 0:
-            print("FAIL")
-        postTest()
-
+        for test in ['create', 'supersede', 'overwrite', 'open_id', 'io', 'mmap', 'rename', 'rename_ex', 'delete', 'delete_ex', 'links', 'links_ex', 'oplock_i', 'oplock_ii', 'oplock_batch', 'oplock_filter', 'oplock_r', 'oplock_rw', 'oplock_rh', 'oplock_rwh', 'cs', 'reparse', 'streams', 'fileinfo', 'ea']:
+            preTest(str(test) +" tests:")
+            f = PureWindowsPath(get_driveletters()[0][1])
+            ret = runWithPrint([str(p.joinpath("winbtrfs", "test.exe")), str(test), str(f)])
+            time.sleep(10)
+            if ret.returncode != 0:
+                print("FAIL")
+            postTest()
 
 
         preTest()