diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c
index 089360be36f..abdd2e454ec 100644
--- a/dlls/msi/tests/automation.c
+++ b/dlls/msi/tests/automation.c
@@ -466,83 +466,138 @@ static DISPID get_dispid( IDispatch *disp, const char *name )
 
 static void test_dispid(void)
 {
-    ok( get_dispid( pInstaller, "CreateRecord" ) == 1, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "OpenPackage" ) == 2, "dispid wrong\n");
-    todo_wine ok( get_dispid( pInstaller, "OpenProduct" ) == 3, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "OpenDatabase" ) == 4, "dispid wrong\n");
-    todo_wine ok( get_dispid( pInstaller, "SummaryInformation" ) == 5, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "UILevel" ) == 6, "dispid wrong\n");
-    todo_wine ok( get_dispid( pInstaller, "EnableLog" ) == 7, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "InstallProduct" ) == 8, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "Version" ) == 9, "dispid wrong\n");
-    todo_wine {
-    ok( get_dispid( pInstaller, "LastErrorRecord" ) == 10, "dispid wrong\n");
-    }
-    ok( get_dispid( pInstaller, "RegistryValue" ) == 11, "dispid wrong\n");
-    todo_wine {
-    ok( get_dispid( pInstaller, "Environment" ) == 12, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "FileAttributes" ) == 13, "dispid wrong\n");
+    DISPID dispid;
 
-    ok( get_dispid( pInstaller, "FileSize" ) == 15, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "FileVersion" ) == 16, "dispid wrong\n");
+    dispid = get_dispid(pInstaller, "CreateRecord");
+    ok(dispid  == 1, "Expected 1, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "OpenPackage");
+    ok(dispid  == 2, "Expected 2, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "OpenDatabase");
+    ok(dispid == 4, "Expected 4, got %d\n", dispid);
+    dispid = get_dispid( pInstaller, "UILevel" );
+    ok(dispid == 6, "Expected 6, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "InstallProduct");
+    ok(dispid == 8, "Expected 8, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "Version");
+    ok(dispid == 9, "Expected 9, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "RegistryValue");
+    ok(dispid == 11, "Expected 11, got %d\n", dispid);
+    todo_wine
+    {
+        dispid = get_dispid(pInstaller, "OpenProduct");
+        ok(dispid  == 3, "Expected 3, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "SummaryInformation");
+        ok(dispid == 5, "Expected 5, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "EnableLog");
+        ok(dispid == 7, "Expected 7, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "LastErrorRecord");
+        ok(dispid == 10, "Expected 10, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "Environment");
+        ok(dispid == 12, "Expected 12, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "FileAttributes");
+        ok(dispid == 13, "Expected 13, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "FileSize");
+        ok(dispid == 15, "Expected 15, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "FileVersion");
+        ok(dispid == 16, "Expected 16, got %d\n", dispid);
     }
-    ok( get_dispid( pInstaller, "ProductState" ) == 17, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ProductInfo" ) == 18, "dispid wrong\n");
-    todo_wine {
-    ok( get_dispid( pInstaller, "ConfigureProduct" ) == 19, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ReinstallProduct" ) == 20 , "dispid wrong\n");
-    ok( get_dispid( pInstaller, "CollectUserInfo" ) == 21, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ApplyPatch" ) == 22, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "FeatureParent" ) == 23, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "FeatureState" ) == 24, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "UseFeature" ) == 25, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "FeatureUsageCount" ) == 26, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "FeatureUsageDate" ) == 27, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ConfigureFeature" ) == 28, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ReinstallFeature" ) == 29, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ProvideComponent" ) == 30, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ComponentPath" ) == 31, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ProvideQualifiedComponent" ) == 32, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "QualifierDescription" ) == 33, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ComponentQualifiers" ) == 34, "dispid wrong\n");
+    dispid = get_dispid(pInstaller, "ProductState");
+    ok(dispid == 17, "Expected 17, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "ProductInfo");
+    ok(dispid == 18, "Expected 18, got %d\n", dispid);
+    todo_wine
+    {
+        dispid = get_dispid(pInstaller, "ConfigureProduct");
+        ok(dispid == 19, "Expected 19, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ReinstallProduct");
+        ok(dispid == 20 , "Expected 20, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "CollectUserInfo");
+        ok(dispid == 21, "Expected 21, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ApplyPatch");
+        ok(dispid == 22, "Expected 22, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "FeatureParent");
+        ok(dispid == 23, "Expected 23, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "FeatureState");
+        ok(dispid == 24, "Expected 24, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "UseFeature");
+        ok(dispid == 25, "Expected 25, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "FeatureUsageCount");
+        ok(dispid == 26, "Expected 26, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "FeatureUsageDate");
+        ok(dispid == 27, "Expected 27, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ConfigureFeature");
+        ok(dispid == 28, "Expected 28, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ReinstallFeature");
+        ok(dispid == 29, "Expected 29, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ProvideComponent");
+        ok(dispid == 30, "Expected 30, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ComponentPath");
+        ok(dispid == 31, "Expected 31, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ProvideQualifiedComponent");
+        ok(dispid == 32, "Expected 32, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "QualifierDescription");
+        ok(dispid == 33, "Expected 33, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ComponentQualifiers");
+        ok(dispid == 34, "Expected 34, got %d\n", dispid);
     }
-    ok( get_dispid( pInstaller, "Products" ) == 35, "dispid wrong\n");
-    todo_wine {
-    ok( get_dispid( pInstaller, "Features" ) == 36, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "Components" ) == 37, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ComponentClients" ) == 38, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "Patches" ) == 39, "dispid wrong\n");
+    dispid = get_dispid(pInstaller, "Products");
+    ok(dispid == 35, "Expected 35, got %d\n", dispid);
+    todo_wine
+    {
+        dispid = get_dispid(pInstaller, "Features");
+        ok(dispid == 36, "Expected 36, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "Components");
+        ok(dispid == 37, "Expected 37, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ComponentClients");
+        ok(dispid == 38, "Expected 38, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "Patches");
+        ok(dispid == 39, "Expected 39, got %d\n", dispid);
     }
-    ok( get_dispid( pInstaller, "RelatedProducts" ) == 40, "dispid wrong\n");
-    todo_wine {
-    ok( get_dispid( pInstaller, "PatchInfo" ) == 41, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "PatchTransforms" ) == 42, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "AddSource" ) == 43, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ClearSourceList" ) == 44, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ForceSourceListResolution" ) == 45, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ShortcutTarget" ) == 46, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "FileHash" ) == 47, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "FileSignatureInfo" ) == 48, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "RemovePatches" ) == 49, "dispid wrong\n");
-
-    ok( get_dispid( pInstaller, "ApplyMultiplePatches" ) == 51, "dispid wrong\n");
-    ok( get_dispid( pInstaller, "ProductsEx" ) ==  52, "dispid wrong\n");
-
-    ok( get_dispid( pInstaller, "PatchesEx" ) == 55, "dispid wrong\n");
-
-    ok( get_dispid( pInstaller, "ExtractPatchXMLData" ) == 57, "dispid wrong\n");
+    dispid = get_dispid(pInstaller, "RelatedProducts");
+    ok(dispid == 40, "Expected 40, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "RemovePatches");
+    ok(dispid == 49 || dispid == -1, "Expected 49 or -1, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "ApplyMultiplePatches");
+    ok(dispid == 51 || dispid == -1, "Expected 51 or -1, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "ProductsEx");
+    ok(dispid == 52 || dispid == -1, "Expected 52 or -1, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "PatchesEx");
+    ok(dispid == 55 || dispid == -1, "Expected 55 or -1, got %d\n", dispid);
+    dispid = get_dispid(pInstaller, "ExtractPatchXMLData");
+    ok(dispid == 57 || dispid == -1, "Expected 57 or -1, got %d\n", dispid);
+    todo_wine
+    {
+        dispid = get_dispid(pInstaller, "PatchInfo");
+        ok(dispid == 41, "Expected 41, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "PatchTransforms");
+        ok(dispid == 42, "Expected 42, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "AddSource");
+        ok(dispid == 43, "Expected 43, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ClearSourceList");
+        ok(dispid == 44, "Expected 44, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ForceSourceListResolution");
+        ok(dispid == 45, "Expected 45, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "ShortcutTarget");
+        ok(dispid == 46, "Expected 46, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "FileHash");
+        ok(dispid == 47, "Expected 47, got %d\n", dispid);
+        dispid = get_dispid(pInstaller, "FileSignatureInfo");
+        ok(dispid == 48, "Expected 48, got %d\n", dispid);
     }
 
     /* MSDN claims the following functions exist but IDispatch->GetIDsOfNames disagrees */
-    if (0)
-    {
-        get_dispid( pInstaller, "ProductElevated" );
-        get_dispid( pInstaller, "ProductInfoFromScript" );
-        get_dispid( pInstaller, "ProvideAssembly" );
-        get_dispid( pInstaller, "CreateAdvertiseScript" );
-        get_dispid( pInstaller, "AdvertiseProduct" );
-        get_dispid( pInstaller, "PatchFiles" );
-    }
+    dispid = get_dispid( pInstaller, "ProductElevated" );
+    ok(dispid == -1, "Expected -1, got %d\n", dispid);
+    dispid = get_dispid( pInstaller, "ProductInfoFromScript" );
+    ok(dispid == -1, "Expected -1, got %d\n", dispid);
+    dispid = get_dispid( pInstaller, "ProvideAssembly" );
+    ok(dispid == -1, "Expected -1, got %d\n", dispid);
+    dispid = get_dispid( pInstaller, "CreateAdvertiseScript" );
+    ok(dispid == -1, "Expected -1, got %d\n", dispid);
+    dispid = get_dispid( pInstaller, "AdvertiseProduct" );
+    ok(dispid == -1, "Expected -1, got %d\n", dispid);
+    dispid = get_dispid( pInstaller, "PatchFiles" );
+    ok(dispid == -1, "Expected -1, got %d\n", dispid);
 }
 
 /* Test basic IDispatch functions */