diff --git a/inc/winfsp/winfsp.h b/inc/winfsp/winfsp.h
index deb44dfd..a598ad54 100644
--- a/inc/winfsp/winfsp.h
+++ b/inc/winfsp/winfsp.h
@@ -45,6 +45,7 @@ extern "C" {
  */
 #if !defined(SYMLINK_FLAG_RELATIVE)
 #define SYMLINK_FLAG_RELATIVE           1
+#define REPARSE_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer)
 typedef struct _REPARSE_DATA_BUFFER
 {
     ULONG ReparseTag;
diff --git a/tst/winfsp-tests/reparse-test.c b/tst/winfsp-tests/reparse-test.c
index 68355716..1c34f16e 100644
--- a/tst/winfsp-tests/reparse-test.c
+++ b/tst/winfsp-tests/reparse-test.c
@@ -12,19 +12,18 @@ extern int NtfsTests;
 extern int WinFspDiskTests;
 extern int WinFspNetTests;
 
-static const GUID reparse_guid =
-    { 0x895fc61e, 0x7b91, 0x4677, { 0xba, 0x3e, 0x79, 0x34, 0xed, 0xf2, 0xb7, 0x43 } };
-
-void reparse_setget_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoTimeout)
+static void reparse_guid_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoTimeout)
 {
     void *memfs = memfs_start_ex(Flags, FileInfoTimeout);
 
+    static const GUID reparse_guid =
+        { 0x895fc61e, 0x7b91, 0x4677, { 0xba, 0x3e, 0x79, 0x34, 0xed, 0xf2, 0xb7, 0x43 } };
     HANDLE Handle;
     BOOL Success;
     WCHAR FilePath[MAX_PATH];
     union
     {
-        REPARSE_DATA_BUFFER D;
+        //REPARSE_DATA_BUFFER D;
         REPARSE_GUID_DATA_BUFFER G;
         UINT8 B[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
     } ReparseDataBuf;
@@ -99,25 +98,129 @@ void reparse_setget_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoTimeout)
     memfs_stop(memfs);
 }
 
-void reparse_setget_test(void)
+void reparse_guid_test(void)
 {
     if (NtfsTests)
     {
         WCHAR DirBuf[MAX_PATH] = L"\\\\?\\";
         GetCurrentDirectoryW(MAX_PATH - 4, DirBuf + 4);
-        reparse_setget_dotest(-1, DirBuf, 0);
+        reparse_guid_dotest(-1, DirBuf, 0);
     }
     if (WinFspDiskTests)
     {
-        reparse_setget_dotest(MemfsDisk, 0, 0);
+        reparse_guid_dotest(MemfsDisk, 0, 0);
     }
     if (WinFspNetTests)
     {
-        reparse_setget_dotest(MemfsNet, L"\\\\memfs\\share", 0);
+        reparse_guid_dotest(MemfsNet, L"\\\\memfs\\share", 0);
+    }
+}
+
+static void reparse_nfs_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoTimeout)
+{
+    void *memfs = memfs_start_ex(Flags, FileInfoTimeout);
+
+    HANDLE Handle;
+    BOOL Success;
+    WCHAR FilePath[MAX_PATH];
+    union
+    {
+        REPARSE_DATA_BUFFER D;
+        //REPARSE_GUID_DATA_BUFFER G;
+        UINT8 B[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
+    } ReparseDataBuf;
+    DWORD Bytes;
+
+    StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\file0",
+        Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
+
+    Handle = CreateFileW(FilePath,
+        FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+        0, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0);
+    ASSERT(INVALID_HANDLE_VALUE != Handle);
+
+    ReparseDataBuf.D.ReparseTag = IO_REPARSE_TAG_NFS;
+    ReparseDataBuf.D.ReparseDataLength = 16;
+    ReparseDataBuf.D.Reserved = 0;
+    *(PUINT64)(ReparseDataBuf.D.GenericReparseBuffer.DataBuffer +  0) = 0x524843;/* NFS_SPECFILE_CHR */
+    *(PUINT32)(ReparseDataBuf.D.GenericReparseBuffer.DataBuffer +  8) = 0x42; /* major */
+    *(PUINT32)(ReparseDataBuf.D.GenericReparseBuffer.DataBuffer + 12) = 0x62; /* minor */
+
+    Success = DeviceIoControl(Handle, FSCTL_SET_REPARSE_POINT,
+        &ReparseDataBuf, REPARSE_DATA_BUFFER_HEADER_SIZE + ReparseDataBuf.D.ReparseDataLength,
+        0, 0,
+        &Bytes, 0);
+    ASSERT(Success);
+
+    Success = DeviceIoControl(Handle, FSCTL_GET_REPARSE_POINT,
+        0, 0,
+        &ReparseDataBuf, sizeof ReparseDataBuf,
+        &Bytes, 0);
+    ASSERT(Success);
+
+    ASSERT(ReparseDataBuf.D.ReparseTag == IO_REPARSE_TAG_NFS);
+    ASSERT(ReparseDataBuf.D.ReparseDataLength == 16);
+    ASSERT(ReparseDataBuf.D.Reserved == 0);
+    ASSERT(*(PUINT64)(ReparseDataBuf.D.GenericReparseBuffer.DataBuffer +  0) == 0x524843);
+    ASSERT(*(PUINT32)(ReparseDataBuf.D.GenericReparseBuffer.DataBuffer +  8) == 0x42);
+    ASSERT(*(PUINT32)(ReparseDataBuf.D.GenericReparseBuffer.DataBuffer + 12) == 0x62);
+
+    CloseHandle(Handle);
+
+    Handle = CreateFileW(FilePath,
+        FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+        0, OPEN_EXISTING, 0, 0);
+    ASSERT(INVALID_HANDLE_VALUE == Handle);
+    ASSERT(ERROR_CANT_ACCESS_FILE == GetLastError());
+
+    Handle = CreateFileW(FilePath,
+        FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+        0, OPEN_EXISTING, FILE_FLAG_OPEN_REPARSE_POINT, 0);
+    ASSERT(INVALID_HANDLE_VALUE != Handle);
+
+    ReparseDataBuf.D.ReparseDataLength = 0;
+
+    Success = DeviceIoControl(Handle, FSCTL_DELETE_REPARSE_POINT,
+        &ReparseDataBuf, REPARSE_DATA_BUFFER_HEADER_SIZE + ReparseDataBuf.D.ReparseDataLength,
+        0, 0,
+        &Bytes, 0);
+    ASSERT(Success);
+
+    Success = DeviceIoControl(Handle, FSCTL_GET_REPARSE_POINT,
+        0, 0,
+        &ReparseDataBuf, sizeof ReparseDataBuf,
+        &Bytes, 0);
+    ASSERT(!Success);
+    ASSERT(ERROR_NOT_A_REPARSE_POINT == GetLastError());
+
+    CloseHandle(Handle);
+
+    Success = DeleteFileW(FilePath);
+    ASSERT(Success);
+
+    memfs_stop(memfs);
+}
+
+void reparse_nfs_test(void)
+{
+    if (NtfsTests)
+    {
+        WCHAR DirBuf[MAX_PATH] = L"\\\\?\\";
+        GetCurrentDirectoryW(MAX_PATH - 4, DirBuf + 4);
+        reparse_nfs_dotest(-1, DirBuf, 0);
+    }
+    if (WinFspDiskTests)
+    {
+        reparse_nfs_dotest(MemfsDisk, 0, 0);
+    }
+    if (WinFspNetTests)
+    {
+        reparse_nfs_dotest(MemfsNet, L"\\\\memfs\\share", 0);
     }
 }
 
 void reparse_tests(void)
 {
-    TEST(reparse_setget_test);
+    TEST(reparse_guid_test);
+    TEST(reparse_nfs_test);
 }