diff --git a/modules/rostests/apitests/shell32/ItemIDList.cpp b/modules/rostests/apitests/shell32/ItemIDList.cpp
index f64ad892823..f577fc8ea9a 100644
--- a/modules/rostests/apitests/shell32/ItemIDList.cpp
+++ b/modules/rostests/apitests/shell32/ItemIDList.cpp
@@ -177,7 +177,7 @@ START_TEST(SHSimpleIDListFromPath)
     }
 
     LPITEMIDLIST pidl;
-    ok_int((pidl = SHSimpleIDListFromPath(L"c:")) != NULL, TRUE);
+    ok_int((pidl = SHSimpleIDListFromPath(L"c:")) != NULL, LOBYTE(GetVersion()) >= 6);
     ILFree(pidl);
     ok_int((pidl = SHSimpleIDListFromPath(L"c:\\")) != NULL, TRUE);
     ILFree(pidl);
diff --git a/modules/rostests/apitests/shell32/ShellInfo.cpp b/modules/rostests/apitests/shell32/ShellInfo.cpp
index 13921611667..f8469bcd638 100644
--- a/modules/rostests/apitests/shell32/ShellInfo.cpp
+++ b/modules/rostests/apitests/shell32/ShellInfo.cpp
@@ -61,7 +61,7 @@ START_TEST(SHGetFileInfo)
     my_ok_all_flags(info.dwAttributes, SFGAO_FILESYSTEM | SFGAO_STREAM);
 
     info.dwAttributes = ~SFGAO_VALIDATE;
-    ok_int(SHGFI(L"c:", info, flags | SHGFI_ATTR_SPECIFIED), TRUE); // ROS fails this, a parsing bug in CDrivesFolder?
+    ok_int(SHGFI(L"c:", info, flags | SHGFI_ATTR_SPECIFIED), LOBYTE(GetVersion()) >= 6);
     my_ok_all_flags(info.dwAttributes, SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR);
 
     info.dwAttributes = ~SFGAO_VALIDATE;