diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index 16909a042..ecb8bf00c 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -816,6 +816,7 @@ HIDAPI_AddDevice(const struct SDL_hid_device_info *info, int num_children, SDL_H
         return NULL;
     }
 
+#define DEBUG_HIDAPI
 #ifdef DEBUG_HIDAPI
     SDL_Log("Added HIDAPI device '%s' VID 0x%.4x, PID 0x%.4x, version %d, serial %s, interface %d, interface_class %d, interface_subclass %d, interface_protocol %d, usage page 0x%.4x, usage 0x%.4x, path = %s, driver = %s (%s)\n", device->name, device->vendor_id, device->product_id, device->version, device->serial ? device->serial : "NONE", device->interface_number, device->interface_class, device->interface_subclass, device->interface_protocol, device->usage_page, device->usage, device->path, device->driver ? device->driver->name : "NONE", device->driver && device->driver->enabled ? "ENABLED" : "DISABLED");
 #endif
diff --git a/test/testautomation_joystick.c b/test/testautomation_joystick.c
index 198128e9c..3baa4ee58 100644
--- a/test/testautomation_joystick.c
+++ b/test/testautomation_joystick.c
@@ -30,7 +30,7 @@ TestVirtualJoystick(void *arg)
     desc.naxes = SDL_CONTROLLER_AXIS_MAX;
     desc.nbuttons = SDL_CONTROLLER_BUTTON_MAX;
     desc.vendor_id = USB_VENDOR_NVIDIA;
-    desc.product_id = USB_PRODUCT_NVIDIA_SHIELD_CONTROLLER;
+    desc.product_id = USB_PRODUCT_NVIDIA_SHIELD_CONTROLLER_V104;
     desc.name = "Virtual NVIDIA SHIELD Controller";
     device_index = SDL_JoystickAttachVirtualEx(&desc);
     SDLTest_AssertCheck(device_index >= 0, "SDL_JoystickAttachVirtualEx()");