diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c
index 3fbe638..80f5d54 100644
--- a/dlls/setupapi/tests/parser.c
+++ b/dlls/setupapi/tests/parser.c
@@ -416,11 +416,15 @@ static void test_close_inf_file(void)
 {
     SetLastError(0xdeadbeef);
     SetupCloseInfFile(NULL);
-    ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", GetLastError());
+    ok(GetLastError() == 0xdeadbeef ||
+       GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
+       "Expected 0xdeadbeef or ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
 
     SetLastError(0xdeadbeef);
     SetupCloseInfFile(INVALID_HANDLE_VALUE);
-    ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", GetLastError());
+    ok(GetLastError() == 0xdeadbeef ||
+       GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */
+       "Expected 0xdeadbeef or ERROR_INVALID_PARAMETER, got %u\n", GetLastError());
 
 }
 
@@ -524,9 +528,12 @@ static void test_SetupGetIntField(void)
         retb = SetupGetIntField( &context, keys[i].index, &intfield );
         if ( keys[i].err == ERROR_SUCCESS )
         {
-            ok( retb, "Expected success\n" );
+            ok( retb ||
+                broken(!retb), /* win9x */
+                "Expected success\n" );
             ok( GetLastError() == ERROR_SUCCESS ||
-                GetLastError() == 0xdeadbeef /* win9x, NT4 */,
+                GetLastError() == 0xdeadbeef || /* NT4 */
+                broken(GetLastError() == ERROR_INVALID_HANDLE), /* win9x */
                 "Expected ERROR_SUCCESS or 0xdeadbeef, got %u\n", GetLastError() );
         }
         else
@@ -535,7 +542,9 @@ static void test_SetupGetIntField(void)
             ok( GetLastError() == keys[i].err,
                 "Expected %d, got %u\n", keys[i].err, GetLastError() );
         }
-        ok( intfield == keys[i].value, "Expected %d, got %d\n", keys[i].value, intfield );
+        ok( intfield == keys[i].value ||
+            broken(intfield == -1), /* win9x */
+            "Expected %d, got %d\n", keys[i].value, intfield );
 
         SetupCloseInfFile( hinf );
     }
-- 
1.5.4.3