diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c
index a0fd2f6c660..0e94ce63aab 100644
--- a/dlls/dinput/tests/hid.c
+++ b/dlls/dinput/tests/hid.c
@@ -339,7 +339,7 @@ static const char inf_text[] =
     "ServiceType=1\n"
     "StartType=3\n"
     "ErrorControl=1\n"
-    "LoadOrderGroup=Extended Base\n"
+    "LoadOrderGroup=WinePlugPlay\n"
     "DisplayName=\"winetest bus driver\"\n"
     "; they don't sleep anymore, on the beach\n";
 
diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c
index 42fbcf808d5..208edf3bc0c 100644
--- a/dlls/dinput/tests/joystick8.c
+++ b/dlls/dinput/tests/joystick8.c
@@ -248,9 +248,6 @@ static void check_dinput_devices( DWORD version, DIDEVICEINSTANCEW *devinst )
         prop_dword.dwData = 0xdeadbeef;
         hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph );
         ok( hr == DI_OK, "GetProperty DIPROP_VIDPID returned %#x\n", hr );
-        /* Wine may get the wrong device here, because the test driver creates another instance of
-           hidclass.sys, and gets duplicate rawinput handles, which we use in the guidInstance */
-        todo_wine_if( prop_dword.dwData != EXPECT_VIDPID )
         ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", prop_dword.dwData, EXPECT_VIDPID );
 
         ref = IDirectInputDevice8_Release( device );