diff --git a/scripts/zts_windows/Readme.txt b/scripts/zts_windows/Readme.txt
index b58cf0bacb30..3d05c3b1bd31 100644
--- a/scripts/zts_windows/Readme.txt
+++ b/scripts/zts_windows/Readme.txt
@@ -11,7 +11,7 @@ Steps to run ZTS for windows
 
 	Step 2 :
 		git clone openzfs from https://github.com/DataCoreSoftware/openzfs
-		Checkout to zfs-test-suite-win branch
+		Checkout to zfs-test-suite-win-raidz branch
 		Build openzfs by follow this URL https://openzfs.github.io/openzfs-docs/Developer%20Resources/Building%20ZFS.html
 
 	Step 3 :
@@ -29,4 +29,4 @@ Step to run python script
 
 Step 1 : Open cmd with Admin privileges
 Seps 2 : Run following to start test
-	python.exe ../openzfs/scripts/zts_windows/zts_windows_test.py "<ZFSin Binaries Release.zip file path>"
\ No newline at end of file
+	python.exe ../openzfs/scripts/zts_windows/zts_windows_test.py "<OpenZFS Binaries Release.zip file path>"
\ No newline at end of file
diff --git a/scripts/zts_windows/ZFS_Test_Config.ini b/scripts/zts_windows/ZFS_Test_Config.ini
index 6166a7a577f5..1f48ef34e6a4 100644
--- a/scripts/zts_windows/ZFS_Test_Config.ini
+++ b/scripts/zts_windows/ZFS_Test_Config.ini
@@ -4,6 +4,7 @@ start = false
 
 [pool_disk]
 disk_id = 1,2,3
+raid_disk_id = 4,5,6,7,8
 
 [error]
 error = false
@@ -11,4 +12,3 @@ error_msg = NA
 
 [last run]
 run_percentage = 0
-
diff --git a/scripts/zts_windows/zts_util_func.py b/scripts/zts_windows/zts_util_func.py
index d3fc23b8cfe2..b71316754660 100644
--- a/scripts/zts_windows/zts_util_func.py
+++ b/scripts/zts_windows/zts_util_func.py
@@ -28,6 +28,7 @@ def clean_disk():
     print("======================= Cleaning Disk ======================\n")
     process = createSubprocess('diskpart.exe')
     disk = config_read("pool_disk","disk_id")
+    disk = disk + config_read("pool_disk","raid_disk_id")
     print(disk)
     disk_arr = disk.split(',')
     for disk_no in disk_arr :
@@ -124,6 +125,7 @@ def uninstall_zfsin():
         process.stdin.write('cd /d c:\\' + "\n")
         process.stdin.write("cd \"c:/zfs-test-suite/ZFS_Binaries/Release\"" + "\n")
         process.stdin.write(".\zfsinstaller uninstall .\ZFSin\ZFSin.inf" + "\n")
+        process.stdin.write("del C:\Windows\System32\drivers\ZFSin.sys"+"\n")
         process.stdin.close()
         output = process.stdout.read()
         print (output)
@@ -243,8 +245,8 @@ def make_dir():
     print(output)
     return
 
-def export_disk():
-    disk = config_read("pool_disk","disk_id")
+def export_disk(disks):
+    disk = config_read("pool_disk",disks)
     print(disk)
     disk_no = disk.split(',')
     disk_path =''
@@ -272,15 +274,18 @@ def cp_runfile_wsl():
     filePath = "C:\\zfs-test-suite\\testing.txt"
     openzfs_folder = openzfs_path_linux()
     line1 = "#/bin/bash"
-    line2 = 'export DISKS='+export_disk()
-    line3 = openzfs_folder + "scripts/zfs-tests.sh"+" -r "+ openzfs_folder +"tests/runfiles/windows.run"
+    line2 = 'export DISKS='+export_disk("disk_id")
+    line3 = 'export RAID_TEST_DISKS='+export_disk("raid_disk_id")
+    line4 = openzfs_folder + "scripts/zfs-tests.sh"+" -r "+ openzfs_folder +"tests/runfiles/windows-All.run"
     print(line1)
     print(line2)
     print(line3)
+    print(line4)
     with open(filePath,"w+") as f:
         f.write(line1+'\n'+'\n')
         f.write(line2+'\n')
         f.write(line3+'\n')
+        f.write(line4+'\n')
 
     cp_to_linux()
     return
diff --git a/scripts/zts_windows/zts_windows_test.py b/scripts/zts_windows/zts_windows_test.py
index 2edb1fcaa553..a5ecb0c9577e 100644
--- a/scripts/zts_windows/zts_windows_test.py
+++ b/scripts/zts_windows/zts_windows_test.py
@@ -57,7 +57,7 @@ def main(argv):
     clean_disk()
 
     if normal_run() :
-            return
+        return
 
     cleanup()