diff --git a/tools/run-tests.bat b/tools/run-tests.bat
index 421711eb..de2c1eb7 100644
--- a/tools/run-tests.bat
+++ b/tools/run-tests.bat
@@ -37,8 +37,10 @@ for %%f in (^
 	:winfsp-tests-x86-mountpoint-drive ^
 	:winfsp-tests-x86-mountpoint-dir ^
 	:winfsp-tests-x86-no-traverse ^
+    :winfsp-tests-x64-disk-share ^
 	:fsx-memfs-x64-disk ^
 	:fsx-memfs-x64-net ^
+    :winfsp-tests-x86-disk-share ^
 	:fsx-memfs-x86-disk ^
 	:fsx-memfs-x86-net ^
 	:winfstest-memfs-x64-disk ^
@@ -140,6 +142,16 @@ winfsp-tests-x86 --no-traverse
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
+:winfsp-tests-x64-disk-share
+M:
+mkdir foo
+if !ERRORLEVEL! neq 0 goto fail
+winfsp-tests-x64 --external --share=winfsp-tests-share=M:\ --resilient
+if !ERRORLEVEL! neq 0 goto fail
+rmdir foo
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
 :fsx-memfs-x64-disk
 M:
 "%ProjRoot%\ext\test\fstools\src\fsx\fsx.exe" -N 5000 test xxxxxx
@@ -156,6 +168,16 @@ if !ERRORLEVEL! neq 0 goto fail
 if !ERRORLEVEL! neq 0 goto fail
 exit /b 0
 
+:winfsp-tests-x86-disk-share
+O:
+mkdir foo
+if !ERRORLEVEL! neq 0 goto fail
+winfsp-tests-x86 --external --share=winfsp-tests-share=O:\ --resilient
+if !ERRORLEVEL! neq 0 goto fail
+rmdir foo
+if !ERRORLEVEL! neq 0 goto fail
+exit /b 0
+
 :fsx-memfs-x86-disk
 O:
 "%ProjRoot%\ext\test\fstools\src\fsx\fsx.exe" -N 5000 test xxxxxx