diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c
index da34f541040..f238146a0fb 100644
--- a/dlls/kernel32/tests/volume.c
+++ b/dlls/kernel32/tests/volume.c
@@ -59,7 +59,9 @@ static void test_FindFirstVolume(void)
 
     handle = pFindFirstVolumeA( volume, 0 );
     ok( handle == INVALID_HANDLE_VALUE, "succeeded with short buffer\n" );
-    ok( GetLastError() == ERROR_FILENAME_EXCED_RANGE, "wrong error %u\n", GetLastError() );
+    ok( GetLastError() == ERROR_MORE_DATA ||  /* XP */
+        GetLastError() == ERROR_FILENAME_EXCED_RANGE,  /* Vista */
+        "wrong error %u\n", GetLastError() );
     handle = pFindFirstVolumeA( volume, 49 );
     ok( handle == INVALID_HANDLE_VALUE, "succeeded with short buffer\n" );
     ok( GetLastError() == ERROR_FILENAME_EXCED_RANGE, "wrong error %u\n", GetLastError() );