diff --git a/build/VStudio/testing/winfsp-tests.vcxproj b/build/VStudio/testing/winfsp-tests.vcxproj
index c6e5651b..d2c93397 100644
--- a/build/VStudio/testing/winfsp-tests.vcxproj
+++ b/build/VStudio/testing/winfsp-tests.vcxproj
@@ -205,6 +205,7 @@
     <ClCompile Include="..\..\..\tst\winfsp-tests\stream-tests.c" />
     <ClCompile Include="..\..\..\tst\winfsp-tests\timeout-test.c" />
     <ClCompile Include="..\..\..\tst\winfsp-tests\version-test.c" />
+    <ClCompile Include="..\..\..\tst\winfsp-tests\volpath-test.c" />
     <ClCompile Include="..\..\..\tst\winfsp-tests\winfsp-tests.c" />
     <ClCompile Include="..\..\..\tst\winfsp-tests\wsl-test.c" />
   </ItemGroup>
diff --git a/build/VStudio/testing/winfsp-tests.vcxproj.filters b/build/VStudio/testing/winfsp-tests.vcxproj.filters
index b07e62e6..516a2310 100644
--- a/build/VStudio/testing/winfsp-tests.vcxproj.filters
+++ b/build/VStudio/testing/winfsp-tests.vcxproj.filters
@@ -103,6 +103,9 @@
     <ClCompile Include="..\..\..\tst\winfsp-tests\launcher-ptrans-test.c">
       <Filter>Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\tst\winfsp-tests\volpath-test.c">
+      <Filter>Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\ext\tlib\testsuite.h">
diff --git a/tst/winfsp-tests/volpath-test.c b/tst/winfsp-tests/volpath-test.c
new file mode 100644
index 00000000..929e6045
--- /dev/null
+++ b/tst/winfsp-tests/volpath-test.c
@@ -0,0 +1,186 @@
+/**
+ * @file volpath-test.c
+ *
+ * @copyright 2015-2019 Bill Zissimopoulos
+ */
+/*
+ * This file is part of WinFsp.
+ *
+ * You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License version 3 as published by the Free Software
+ * Foundation.
+ *
+ * Licensees holding a valid commercial license may use this software
+ * in accordance with the commercial license agreement provided in
+ * conjunction with the software.  The terms and conditions of any such
+ * commercial license agreement shall govern, supersede, and render
+ * ineffective any application of the GPLv3 license to this software,
+ * notwithstanding of any reference thereto in the software or
+ * associated repository.
+ */
+
+#include <winfsp/winfsp.h>
+#include <tlib/testsuite.h>
+#include <strsafe.h>
+#include "memfs.h"
+
+#include "winfsp-tests.h"
+
+static void volpath_dotest(ULONG Flags, PWSTR Prefix)
+{
+    void *memfs = memfs_start(Flags);
+
+    HANDLE Handle;
+    BOOLEAN Success, VolumePathNameSuccess[8];
+    WCHAR FilePath[MAX_PATH];
+    WCHAR VolumePathName[MAX_PATH];
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    Success = CreateDirectoryW(FilePath, 0);
+    ASSERT(Success);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\file2",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    Handle = CreateFileW(FilePath,
+        GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0);
+    ASSERT(INVALID_HANDLE_VALUE != Handle);
+    CloseHandle(Handle);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    VolumePathNameSuccess[0] = GetVolumePathNameW(FilePath, VolumePathName, MAX_PATH);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    VolumePathNameSuccess[1] = GetVolumePathNameW(FilePath, VolumePathName, MAX_PATH);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\file2",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    VolumePathNameSuccess[2] = GetVolumePathNameW(FilePath, VolumePathName, MAX_PATH);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\file2",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    Success = DeleteFileW(FilePath);
+    ASSERT(Success);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    Success = RemoveDirectoryW(FilePath);
+    ASSERT(Success);
+
+    memfs_stop(memfs);
+
+    ASSERT(VolumePathNameSuccess[0] == VolumePathNameSuccess[1]);
+    ASSERT(VolumePathNameSuccess[1] == VolumePathNameSuccess[2]);
+}
+
+static void volpath_test(void)
+{
+    if (NtfsTests)
+    {
+        WCHAR DirBuf[MAX_PATH];
+        GetTestDirectory(DirBuf);
+        volpath_dotest(-1, DirBuf);
+    }
+    if (WinFspDiskTests)
+        volpath_dotest(MemfsDisk, 0);
+    if (WinFspNetTests)
+        volpath_dotest(MemfsNet, L"\\\\memfs\\share");
+}
+
+static void volpath_mount_dotest(ULONG Flags, PWSTR Prefix)
+{
+    void *memfs = memfs_start(Flags);
+
+    NTSTATUS Result;
+    HANDLE Handle;
+    BOOLEAN Success, VolumePathNameSuccess[8];
+    WCHAR FilePath[MAX_PATH];
+    WCHAR VolumePathName[MAX_PATH];
+
+    Result = FspFileSystemSetMountPoint(MemfsFileSystem(memfs), 0);
+    ASSERT(NT_SUCCESS(Result));
+
+    Prefix = FspFileSystemMountPoint(MemfsFileSystem(memfs));
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    Success = CreateDirectoryW(FilePath, 0);
+    ASSERT(Success);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\file2",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    Handle = CreateFileW(FilePath,
+        GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0);
+    ASSERT(INVALID_HANDLE_VALUE != Handle);
+    CloseHandle(Handle);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    VolumePathNameSuccess[0] = GetVolumePathNameW(FilePath, VolumePathName, MAX_PATH);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    VolumePathNameSuccess[1] = GetVolumePathNameW(FilePath, VolumePathName, MAX_PATH);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\file2",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    VolumePathNameSuccess[2] = GetVolumePathNameW(FilePath, VolumePathName, MAX_PATH);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1\\file2",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    Success = DeleteFileW(FilePath);
+    ASSERT(Success);
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\dir1",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    Success = RemoveDirectoryW(FilePath);
+    ASSERT(Success);
+
+    memfs_stop(memfs);
+
+    ASSERT(VolumePathNameSuccess[0] == VolumePathNameSuccess[1]);
+    ASSERT(VolumePathNameSuccess[1] == VolumePathNameSuccess[2]);
+}
+
+static void volpath_mount_test(void)
+{
+    /*
+     * This test does FspFileSystemSetMountPoint and therefore
+     * cannot be used with --external or --mountpoint.
+     */
+    if (NtfsTests || OptMountPoint)
+        return;
+
+    if (WinFspDiskTests)
+        volpath_mount_dotest(MemfsDisk, 0);
+    if (WinFspNetTests)
+        volpath_mount_dotest(MemfsNet, L"\\\\memfs\\share");
+}
+
+void volpath_tests(void)
+{
+    TEST(volpath_test);
+
+    /*
+     * This test does FspFileSystemSetMountPoint and therefore
+     * cannot be used with --external or --mountpoint.
+     */
+    if (!NtfsTests && !OptMountPoint)
+        TEST(volpath_mount_test);
+}
diff --git a/tst/winfsp-tests/winfsp-tests.c b/tst/winfsp-tests/winfsp-tests.c
index 06d9a61f..93e033eb 100644
--- a/tst/winfsp-tests/winfsp-tests.c
+++ b/tst/winfsp-tests/winfsp-tests.c
@@ -211,6 +211,7 @@ int main(int argc, char *argv[])
     TESTSUITE(stream_tests);
     TESTSUITE(oplock_tests);
     TESTSUITE(wsl_tests);
+    TESTSUITE(volpath_tests);
 
     atexit(exiting);
     signal(SIGABRT, abort_handler);