diff --git a/server/site_tests/platform_ExternalUSBBootStress/control.50 b/server/site_tests/platform_ExternalUSBBootStress/control.50
index 1360560..673ea7a 100644
--- a/server/site_tests/platform_ExternalUSBBootStress/control.50
+++ b/server/site_tests/platform_ExternalUSBBootStress/control.50
@@ -14,7 +14,7 @@
 TEST_TYPE = "server"
 # Stop running the test due to crbug.com/654478
 # ATTRIBUTES = "suite:usb_detect_stress"
-# DEPENDENCIES = "servo, usb_detect"
+# DEPENDENCIES = "servo"
 
 
 DOC = """
diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control.crashes b/server/site_tests/platform_ExternalUsbPeripherals/control.crashes
index 75fdcd9..1a7874f 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control.crashes
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control.crashes
@@ -13,7 +13,7 @@
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
 #ATTRIBUTES = "suite:usb_detect"
-DEPENDENCIES = "servo, usb_detect"
+DEPENDENCIES = "servo"
 
 DOC = """
 This test uses servo to connect/disconnect servo USB hub before and
diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control.detect b/server/site_tests/platform_ExternalUsbPeripherals/control.detect
index 28382ed..1815e9d 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control.detect
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control.detect
@@ -13,7 +13,7 @@
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:usb_detect_stress"
-DEPENDENCIES = "servo, usb_detect"
+DEPENDENCIES = "servo"
 
 DOC = """
 This test uses servo to connect/disconnect servo USB hub before and
diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.crash_check_short b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.crash_check_short
index 3ab886a..6a5c0ce 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.crash_check_short
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.crash_check_short
@@ -13,7 +13,7 @@
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:usb_detect"
-DEPENDENCIES = "servo, usb_detect"
+DEPENDENCIES = "servo"
 
 DOC = """
 This test uses servo to connect/disconnect servo USB hub before and
diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.lid_close_open_short b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.lid_close_open_short
index 422b1cf..b9f427c 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.lid_close_open_short
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.lid_close_open_short
@@ -13,7 +13,7 @@
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:usb_detect"
-DEPENDENCIES = "servo, usb_detect, use_lid"
+DEPENDENCIES = "servo, use_lid"
 JOB_RETRIES = 1
 DOC = """
 This test uses servo to connect/disconnect servo USB hub before and
diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.login_unplug_closelid_openlid_plug b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.login_unplug_closelid_openlid_plug
index b00068b..e8666d7 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.login_unplug_closelid_openlid_plug
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.login_unplug_closelid_openlid_plug
@@ -13,7 +13,7 @@
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:usb_detect"
-DEPENDENCIES = "servo, usb_detect, use_lid"
+DEPENDENCIES = "servo, use_lid"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.long_cycle b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.long_cycle
index cfef39e..8519d34 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.long_cycle
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.long_cycle
@@ -13,7 +13,7 @@
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:usb_detect"
-DEPENDENCIES = "servo, usb_detect"
+DEPENDENCIES = "servo"
 
 DOC = """
 This test uses servo to connect/disconnect servo USB hub before and
diff --git a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.unplug_login_plug b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.unplug_login_plug
index 678cb2e..4013166 100644
--- a/server/site_tests/platform_ExternalUsbPeripherals/control.detect.unplug_login_plug
+++ b/server/site_tests/platform_ExternalUsbPeripherals/control.detect.unplug_login_plug
@@ -13,7 +13,7 @@
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:usb_detect"
-DEPENDENCIES = "servo, usb_detect"
+DEPENDENCIES = "servo"
 
 DOC = """
 This test uses servo to connect/disconnect servo USB hub before and
diff --git a/server/site_tests/platform_SuspendResumeTiming/control b/server/site_tests/platform_SuspendResumeTiming/control
index 37eff7c..9162df1 100644
--- a/server/site_tests/platform_SuspendResumeTiming/control
+++ b/server/site_tests/platform_SuspendResumeTiming/control
@@ -13,7 +13,7 @@
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:usb_detect"
-DEPENDENCIES = "servo, usb_detect"
+DEPENDENCIES = "servo"
 
 DOC = """
 This test measures the time to suspend and resume
@@ -29,4 +29,4 @@
     job.run_test("platform_SuspendResumeTiming", host=host,
                  plug_usb=False, disable_sysinfo=True)
 
-parallel_simple(run, machines)
\ No newline at end of file
+parallel_simple(run, machines)
diff --git a/server/site_tests/platform_SuspendResumeTiming/control.usb_plugged b/server/site_tests/platform_SuspendResumeTiming/control.usb_plugged
index 2b77f3c..f401a24 100644
--- a/server/site_tests/platform_SuspendResumeTiming/control.usb_plugged
+++ b/server/site_tests/platform_SuspendResumeTiming/control.usb_plugged
@@ -13,7 +13,7 @@
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:usb_detect"
-DEPENDENCIES = "servo, usb_detect"
+DEPENDENCIES = "servo"
 
 DOC = """
 This test measures the time to suspend and resume
@@ -29,4 +29,4 @@
     job.run_test("platform_SuspendResumeTiming", host=host,
                  plug_usb=True, disable_sysinfo=True)
 
-parallel_simple(run, machines)
\ No newline at end of file
+parallel_simple(run, machines)