diff --git a/patches/kernel32-GetVolumePathName/0002-kernel32-Convert-GetVolumePathName-tests-into-a-list.patch b/patches/kernel32-GetVolumePathName/0002-kernel32-Convert-GetVolumePathName-tests-into-a-list.patch
index e35cb308..7fa65dcf 100644
--- a/patches/kernel32-GetVolumePathName/0002-kernel32-Convert-GetVolumePathName-tests-into-a-list.patch
+++ b/patches/kernel32-GetVolumePathName/0002-kernel32-Convert-GetVolumePathName-tests-into-a-list.patch
@@ -1,4 +1,4 @@
-From d97c71c769284c7df3d870a401c3fc7a4a8e35ad Mon Sep 17 00:00:00 2001
+From 7739a32bd18ed7912e610941f6cfb273748b82cd Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Sat, 25 Jan 2014 09:53:39 -0700
 Subject: kernel32: Convert GetVolumePathName tests into a list.
@@ -8,7 +8,7 @@ Subject: kernel32: Convert GetVolumePathName tests into a list.
  1 file changed, 74 insertions(+), 63 deletions(-)
 
 diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c
-index 4b3bdf5..a59c92c 100644
+index 4b3bdf5..f15269c 100644
 --- a/dlls/kernel32/tests/volume.c
 +++ b/dlls/kernel32/tests/volume.c
 @@ -591,79 +591,90 @@ static void test_disk_extents(void)
@@ -106,7 +106,7 @@ index 4b3bdf5..a59c92c 100644
 +        ret = pGetVolumePathNameA( test_paths[i].file_name, output, test_paths[i].path_len );
 +        error = GetLastError();
 +        ok(ret == expected_ret, "GetVolumePathName test %d %s unexpectedly.\n",
-+                    i, test_paths[i].error == NO_ERROR ? "failed" : "succeeded");
++                                i, test_paths[i].error == NO_ERROR ? "failed" : "succeeded");
  
 -    SetLastError( 0xdeadbeef );
 -    ret = pGetVolumePathNameA(pathC1, volume, 0);
@@ -157,7 +157,7 @@ index 4b3bdf5..a59c92c 100644
 +        else
 +        {
 +            /* On success Windows always returns ERROR_MORE_DATA, so only worry about failure */
-+            success = (error == test_paths[i].error);
++            success = (error == test_paths[i].error || broken(error == test_paths[i].broken_error));
 +            ok(success, "GetVolumePathName test %d unexpectedly returned error 0x%x (expected 0x%x).\n",
 +                        i, error, test_paths[i].error);
 +        }
diff --git a/patches/kernel32-GetVolumePathName/0003-kernel32-Add-a-bunch-more-GetVolumePathName-tests.patch b/patches/kernel32-GetVolumePathName/0003-kernel32-Add-a-bunch-more-GetVolumePathName-tests.patch
index 61a7f089..23cbec53 100644
--- a/patches/kernel32-GetVolumePathName/0003-kernel32-Add-a-bunch-more-GetVolumePathName-tests.patch
+++ b/patches/kernel32-GetVolumePathName/0003-kernel32-Add-a-bunch-more-GetVolumePathName-tests.patch
@@ -1,4 +1,4 @@
-From 306e9f062349490fcbb8327f9d8369468399535c Mon Sep 17 00:00:00 2001
+From a6eb5189737a6aeb31dd305649f407ca5ddc9faf Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Sat, 25 Jan 2014 09:54:39 -0700
 Subject: kernel32: Add a bunch more GetVolumePathName tests.
@@ -8,7 +8,7 @@ Subject: kernel32: Add a bunch more GetVolumePathName tests.
  1 file changed, 28 insertions(+)
 
 diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c
-index a59c92c..54f1cfd 100644
+index f15269c..e17cc16 100644
 --- a/dlls/kernel32/tests/volume.c
 +++ b/dlls/kernel32/tests/volume.c
 @@ -635,6 +635,34 @@ static void test_GetVolumePathNameA(void)