diff --git a/src/linux/integration-test.py b/src/linux/integration-test.py
index 8333525..defe838 100755
--- a/src/linux/integration-test.py
+++ b/src/linux/integration-test.py
@@ -842,7 +842,7 @@ class Tests(dbusmock.DBusTestCase):
         '''UPS properties without AC'''
 
         # add a charging UPS
-        ups0 = self.testbed.add_device('usb', 'hiddev0', None, [],
+        ups0 = self.testbed.add_device('usbmisc', 'hiddev0', None, [],
                                        ['DEVNAME', 'null', 'UPOWER_VENDOR', 'APC',
                                         'UPOWER_BATTERY_TYPE', 'ups',
                                         'UPOWER_FAKE_DEVICE', '1',
@@ -893,7 +893,7 @@ class Tests(dbusmock.DBusTestCase):
         '''UPS properties with offline AC'''
 
         # add low charge UPS
-        ups0 = self.testbed.add_device('usb', 'hiddev0', None, [],
+        ups0 = self.testbed.add_device('usbmisc', 'hiddev0', None, [],
                                        ['DEVNAME', 'null', 'UPOWER_VENDOR', 'APC',
                                         'UPOWER_BATTERY_TYPE', 'ups',
                                         'UPOWER_FAKE_DEVICE', '1',
diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
index f46a88d..56adbf8 100644
--- a/src/linux/up-backend.c
+++ b/src/linux/up-backend.c
@@ -144,7 +144,7 @@ up_backend_device_new (UpBackend *backend, GUdevDevice *native)
 		/* no valid TTY object */
 		g_clear_object (&device);
 
-	} else if (g_strcmp0 (subsys, "usb") == 0 || g_strcmp0 (subsys, "usbmisc") == 0) {
+	} else if (g_strcmp0 (subsys, "usbmisc") == 0) {
 
 #ifdef HAVE_IDEVICE
 		/* see if this is an iDevice */
@@ -496,8 +496,8 @@ up_backend_coldplug (UpBackend *backend, UpDaemon *daemon)
 	GList *devices;
 	GList *l;
 	guint i;
-	const gchar *subsystems_wup[] = {"power_supply", "usb", "usbmisc", "tty", "input", NULL};
-	const gchar *subsystems[] = {"power_supply", "usb", "usbmisc", "input", NULL};
+	const gchar *subsystems_wup[] = {"power_supply", "usbmisc", "tty", "input", NULL};
+	const gchar *subsystems[] = {"power_supply", "usbmisc", "input", NULL};
 
 	backend->priv->daemon = g_object_ref (daemon);
 	backend->priv->device_list = up_daemon_get_device_list (daemon);