diff --git a/server/site_tests/audio_AudioARCPlayback/control.headphone b/server/site_tests/audio_AudioARCPlayback/control.headphone
index 0906f0a..161bd5d 100644
--- a/server/site_tests/audio_AudioARCPlayback/control.headphone
+++ b/server/site_tests/audio_AudioARCPlayback/control.headphone
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box, arc"
+DEPENDENCIES = "chameleon, audio_board, audio_box, arc, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioARCRecord/control.ext_mic b/server/site_tests/audio_AudioARCRecord/control.ext_mic
index e77a6c9..45ab98b 100644
--- a/server/site_tests/audio_AudioARCRecord/control.ext_mic
+++ b/server/site_tests/audio_AudioARCRecord/control.ext_mic
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box, arc"
+DEPENDENCIES = "chameleon, audio_board, audio_box, arc, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioAfterReboot/control.external_mic b/server/site_tests/audio_AudioAfterReboot/control.external_mic
index 3842cf1..0a36fdb 100644
--- a/server/site_tests/audio_AudioAfterReboot/control.external_mic
+++ b/server/site_tests/audio_AudioAfterReboot/control.external_mic
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = 'chameleon, audio_board, audio_box'
+DEPENDENCIES = 'chameleon, audio_board, audio_box, test_audiojack'
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioAfterReboot/control.headphone b/server/site_tests/audio_AudioAfterReboot/control.headphone
index ee0fa5e..a995794 100644
--- a/server/site_tests/audio_AudioAfterReboot/control.headphone
+++ b/server/site_tests/audio_AudioAfterReboot/control.headphone
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = 'chameleon, audio_board, audio_box'
+DEPENDENCIES = 'chameleon, audio_board, audio_box, test_audiojack'
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioAfterSuspend/control.external_mic b/server/site_tests/audio_AudioAfterSuspend/control.external_mic
index bfa57c1..66872c7 100644
--- a/server/site_tests/audio_AudioAfterSuspend/control.external_mic
+++ b/server/site_tests/audio_AudioAfterSuspend/control.external_mic
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_perbuild, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board"
+DEPENDENCIES = "chameleon, audio_board, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioAfterSuspend/control.external_mic.unplug b/server/site_tests/audio_AudioAfterSuspend/control.external_mic.unplug
index 288145a..d86ebf2 100644
--- a/server/site_tests/audio_AudioAfterSuspend/control.external_mic.unplug
+++ b/server/site_tests/audio_AudioAfterSuspend/control.external_mic.unplug
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioAfterSuspend/control.headphone b/server/site_tests/audio_AudioAfterSuspend/control.headphone
index 41559fd..e81721a 100644
--- a/server/site_tests/audio_AudioAfterSuspend/control.headphone
+++ b/server/site_tests/audio_AudioAfterSuspend/control.headphone
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_perbuild, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board"
+DEPENDENCIES = "chameleon, audio_board, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioAfterSuspend/control.headphone.unplug b/server/site_tests/audio_AudioAfterSuspend/control.headphone.unplug
index 93f1556..254c778 100644
--- a/server/site_tests/audio_AudioAfterSuspend/control.headphone.unplug
+++ b/server/site_tests/audio_AudioAfterSuspend/control.headphone.unplug
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioArtifacts/control.hdmi b/server/site_tests/audio_AudioArtifacts/control.hdmi
index 07461fa..13cf507 100644
--- a/server/site_tests/audio_AudioArtifacts/control.hdmi
+++ b/server/site_tests/audio_AudioArtifacts/control.hdmi
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_hdmiaudio"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioArtifacts/control.headphone b/server/site_tests/audio_AudioArtifacts/control.headphone
index ece9757..458671a 100644
--- a/server/site_tests/audio_AudioArtifacts/control.headphone
+++ b/server/site_tests/audio_AudioArtifacts/control.headphone
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioArtifacts/control.headphone.150s b/server/site_tests/audio_AudioArtifacts/control.headphone.150s
index d978ea8..83d36cf 100644
--- a/server/site_tests/audio_AudioArtifacts/control.headphone.150s
+++ b/server/site_tests/audio_AudioArtifacts/control.headphone.150s
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioArtifacts/control.mute_headphone b/server/site_tests/audio_AudioArtifacts/control.mute_headphone
index f31f734..ba3c731 100644
--- a/server/site_tests/audio_AudioArtifacts/control.mute_headphone
+++ b/server/site_tests/audio_AudioArtifacts/control.mute_headphone
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioArtifacts/control.volume_changing_headphone b/server/site_tests/audio_AudioArtifacts/control.volume_changing_headphone
index c604dcf..007cfde 100644
--- a/server/site_tests/audio_AudioArtifacts/control.volume_changing_headphone
+++ b/server/site_tests/audio_AudioArtifacts/control.volume_changing_headphone
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicExternalMicrophone/control b/server/site_tests/audio_AudioBasicExternalMicrophone/control
index 97d28c8..72c208f 100644
--- a/server/site_tests/audio_AudioBasicExternalMicrophone/control
+++ b/server/site_tests/audio_AudioBasicExternalMicrophone/control
@@ -13,7 +13,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_perbuild, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board"
+DEPENDENCIES = "chameleon, audio_board, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicExternalMicrophone/control.bvt b/server/site_tests/audio_AudioBasicExternalMicrophone/control.bvt
deleted file mode 100644
index 615b8d5..0000000
--- a/server/site_tests/audio_AudioBasicExternalMicrophone/control.bvt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from autotest_lib.server import utils
-
-AUTHOR = "chromeos-chameleon"
-NAME = "audio_AudioBasicExternalMicrophone.bvt"
-PURPOSE = "Remotely controlled external microphone audio test."
-CRITERIA = "This test will fail if the captured audio does not match original file."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "audio"
-TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
-DEPENDENCIES = "board:veyron_jerry, audio_board"
-JOB_RETRIES = 2
-
-DOC = """
-This test remotely tests external microphone audio function.
-"""
-
-args_dict = utils.args_to_dict(args)
-chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
-
-def run(machine):
-    host = hosts.create_host(machine, chameleon_args=chameleon_args)
-    job.run_test("audio_AudioBasicExternalMicrophone", host=host, tag="bvt")
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/audio_AudioBasicExternalMicrophone/control.quality b/server/site_tests/audio_AudioBasicExternalMicrophone/control.quality
index e994fc0..a8b5249 100644
--- a/server/site_tests/audio_AudioBasicExternalMicrophone/control.quality
+++ b/server/site_tests/audio_AudioBasicExternalMicrophone/control.quality
@@ -13,7 +13,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board"
+DEPENDENCIES = "chameleon, audio_board, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicHDMI/control b/server/site_tests/audio_AudioBasicHDMI/control
index 9000991..5297e7a 100644
--- a/server/site_tests/audio_AudioBasicHDMI/control
+++ b/server/site_tests/audio_AudioBasicHDMI/control
@@ -13,7 +13,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = 'chameleon:hdmi, audio_board'
+DEPENDENCIES = 'chameleon:hdmi, audio_board, test_hdmiaudio'
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicHDMI/control.suspend b/server/site_tests/audio_AudioBasicHDMI/control.suspend
index ea53048..441ecaf 100644
--- a/server/site_tests/audio_AudioBasicHDMI/control.suspend
+++ b/server/site_tests/audio_AudioBasicHDMI/control.suspend
@@ -13,7 +13,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = 'chameleon:hdmi, audio_board'
+DEPENDENCIES = 'chameleon:hdmi, audio_board, test_hdmiaudio'
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicHDMI/control.suspend_while_playback b/server/site_tests/audio_AudioBasicHDMI/control.suspend_while_playback
index 74890c9..8a013f4 100644
--- a/server/site_tests/audio_AudioBasicHDMI/control.suspend_while_playback
+++ b/server/site_tests/audio_AudioBasicHDMI/control.suspend_while_playback
@@ -13,7 +13,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = 'chameleon:hdmi, audio_board'
+DEPENDENCIES = 'chameleon:hdmi, audio_board, test_hdmiaudio'
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicHeadphone/control b/server/site_tests/audio_AudioBasicHeadphone/control
index 0c2a167..5e8ba11 100644
--- a/server/site_tests/audio_AudioBasicHeadphone/control
+++ b/server/site_tests/audio_AudioBasicHeadphone/control
@@ -13,7 +13,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_perbuild, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board"
+DEPENDENCIES = "chameleon, audio_board, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicHeadphone/control.bvt b/server/site_tests/audio_AudioBasicHeadphone/control.bvt
deleted file mode 100644
index 61c6438..0000000
--- a/server/site_tests/audio_AudioBasicHeadphone/control.bvt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from autotest_lib.server import utils
-
-AUTHOR = "chromeos-chameleon"
-NAME = "audio_AudioBasicHeadphone.bvt"
-PURPOSE = "Remotely controlled headphone audio test."
-CRITERIA = "This test will fail if the captured audio does not match original file."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "audio"
-TEST_TYPE = "server"
-ATTRIBUTES = "suite:bvt-perbuild"
-DEPENDENCIES = "board:veyron_jerry, audio_board"
-JOB_RETRIES = 2
-
-DOC = """
-This test remotely tests headphone audio function.
-"""
-
-args_dict = utils.args_to_dict(args)
-chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
-
-def run(machine):
-    host = hosts.create_host(machine, chameleon_args=chameleon_args)
-    job.run_test("audio_AudioBasicHeadphone", host=host, tag="bvt")
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/audio_AudioBasicHeadphone/control.quality b/server/site_tests/audio_AudioBasicHeadphone/control.quality
index dfc3f42..7b84cbb 100644
--- a/server/site_tests/audio_AudioBasicHeadphone/control.quality
+++ b/server/site_tests/audio_AudioBasicHeadphone/control.quality
@@ -13,7 +13,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board"
+DEPENDENCIES = "chameleon, audio_board, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicUSBPlayback/control b/server/site_tests/audio_AudioBasicUSBPlayback/control
index 4fc16d7..268e13e 100644
--- a/server/site_tests/audio_AudioBasicUSBPlayback/control
+++ b/server/site_tests/audio_AudioBasicUSBPlayback/control
@@ -13,7 +13,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = 'chameleon, audio_board'
+DEPENDENCIES = 'chameleon, audio_board, test_usbaudio'
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicUSBPlayback/control.suspend b/server/site_tests/audio_AudioBasicUSBPlayback/control.suspend
index 5a6fe7e..92fb025 100644
--- a/server/site_tests/audio_AudioBasicUSBPlayback/control.suspend
+++ b/server/site_tests/audio_AudioBasicUSBPlayback/control.suspend
@@ -13,7 +13,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = 'chameleon, audio_board'
+DEPENDENCIES = 'chameleon, audio_board, test_usbaudio'
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control b/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control
index 0cc2174..50d6341 100644
--- a/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control
+++ b/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control
@@ -13,7 +13,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = 'chameleon, audio_board'
+DEPENDENCIES = 'chameleon, audio_board, test_usbaudio'
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control.suspend b/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control.suspend
index 5d907e7..76a09c8 100644
--- a/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control.suspend
+++ b/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control.suspend
@@ -13,7 +13,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = 'chameleon, audio_board'
+DEPENDENCIES = 'chameleon, audio_board, test_usbaudio'
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicUSBRecord/control b/server/site_tests/audio_AudioBasicUSBRecord/control
index 5bc6bd7..79c6162 100644
--- a/server/site_tests/audio_AudioBasicUSBRecord/control
+++ b/server/site_tests/audio_AudioBasicUSBRecord/control
@@ -13,7 +13,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = 'chameleon, audio_board'
+DEPENDENCIES = 'chameleon, audio_board, test_usbaudio'
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioBasicUSBRecord/control.suspend b/server/site_tests/audio_AudioBasicUSBRecord/control.suspend
index bc37745..400514c 100644
--- a/server/site_tests/audio_AudioBasicUSBRecord/control.suspend
+++ b/server/site_tests/audio_AudioBasicUSBRecord/control.suspend
@@ -13,7 +13,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = 'chameleon, audio_board'
+DEPENDENCIES = 'chameleon, audio_board, test_usbaudio'
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioNodeSwitch/control.HDMI b/server/site_tests/audio_AudioNodeSwitch/control.HDMI
index 15ebc71..d105a82 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.HDMI
+++ b/server/site_tests/audio_AudioNodeSwitch/control.HDMI
@@ -14,7 +14,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_hdmiaudio"
 
 DOC = """
 This test remotely tests audio nodes selection.
diff --git a/server/site_tests/audio_AudioNodeSwitch/control.HDMI_JACK_USB b/server/site_tests/audio_AudioNodeSwitch/control.HDMI_JACK_USB
index 0c677cd..4cc7ede 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.HDMI_JACK_USB
+++ b/server/site_tests/audio_AudioNodeSwitch/control.HDMI_JACK_USB
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack, test_usbaudio, test_hdmiaudio"
 
 DOC = """
 This test remotely tests audio nodes selection.
diff --git a/server/site_tests/audio_AudioNodeSwitch/control.HDMI_USB b/server/site_tests/audio_AudioNodeSwitch/control.HDMI_USB
index dd5dd31..f4603eb 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.HDMI_USB
+++ b/server/site_tests/audio_AudioNodeSwitch/control.HDMI_USB
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_usbaudio, test_hdmiaudio"
 
 DOC = """
 This test remotely tests audio nodes selection.
diff --git a/server/site_tests/audio_AudioNodeSwitch/control.JACK b/server/site_tests/audio_AudioNodeSwitch/control.JACK
index 6e6c5cf..7e6438d 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.JACK
+++ b/server/site_tests/audio_AudioNodeSwitch/control.JACK
@@ -14,7 +14,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack"
 
 DOC = """
 This test remotely tests audio nodes selection.
diff --git a/server/site_tests/audio_AudioNodeSwitch/control.JACK_HDMI b/server/site_tests/audio_AudioNodeSwitch/control.JACK_HDMI
index 8c64799..9cc043c 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.JACK_HDMI
+++ b/server/site_tests/audio_AudioNodeSwitch/control.JACK_HDMI
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack, test_hdmiaudio"
 
 DOC = """
 This test remotely tests audio nodes selection.
diff --git a/server/site_tests/audio_AudioNodeSwitch/control.JACK_USB b/server/site_tests/audio_AudioNodeSwitch/control.JACK_USB
index cc5655a..3f62f49 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.JACK_USB
+++ b/server/site_tests/audio_AudioNodeSwitch/control.JACK_USB
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack, test_usbaudio"
 
 DOC = """
 This test remotely tests audio nodes selection.
diff --git a/server/site_tests/audio_AudioNodeSwitch/control.USB b/server/site_tests/audio_AudioNodeSwitch/control.USB
index 9845d9c..86d548f 100644
--- a/server/site_tests/audio_AudioNodeSwitch/control.USB
+++ b/server/site_tests/audio_AudioNodeSwitch/control.USB
@@ -14,7 +14,7 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_usbaudio"
 
 DOC = """
 This test remotely tests audio nodes selection.
diff --git a/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_m4a b/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_m4a
index 2baf9d2..46a4b93 100644
--- a/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_m4a
+++ b/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_m4a
@@ -16,7 +16,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board"
+DEPENDENCIES = "chameleon, audio_board, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_mp3 b/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_mp3
index 21e4316..6218f3a 100644
--- a/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_mp3
+++ b/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_mp3
@@ -16,7 +16,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board"
+DEPENDENCIES = "chameleon, audio_board, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_wav b/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_wav
index 59c0a3e..d1e261f 100644
--- a/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_wav
+++ b/server/site_tests/audio_AudioQualityAfterSuspend/control.headphone_wav
@@ -16,7 +16,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board"
+DEPENDENCIES = "chameleon, audio_board, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioVolume/control.hdmi b/server/site_tests/audio_AudioVolume/control.hdmi
index ffc340f..b164e88 100644
--- a/server/site_tests/audio_AudioVolume/control.hdmi
+++ b/server/site_tests/audio_AudioVolume/control.hdmi
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_hdmiaudio"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioVolume/control.headphone b/server/site_tests/audio_AudioVolume/control.headphone
index ea6458d..ae515bc 100644
--- a/server/site_tests/audio_AudioVolume/control.headphone
+++ b/server/site_tests/audio_AudioVolume/control.headphone
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_AudioVolume/control.usb b/server/site_tests/audio_AudioVolume/control.usb
index 67ffbc0..90d0881 100644
--- a/server/site_tests/audio_AudioVolume/control.usb
+++ b/server/site_tests/audio_AudioVolume/control.usb
@@ -15,7 +15,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_nightly, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_usbaudio"
 JOB_RETRIES = 2
 
 DOC = """
diff --git a/server/site_tests/audio_InternalCardNodes/control b/server/site_tests/audio_InternalCardNodes/control
index c98f2f5..bb62520 100644
--- a/server/site_tests/audio_InternalCardNodes/control
+++ b/server/site_tests/audio_InternalCardNodes/control
@@ -13,7 +13,7 @@
 TEST_CLASS = "audio"
 TEST_TYPE = "server"
 ATTRIBUTES = "suite:chameleon_audio_perbuild, suite:chameleon_audio"
-DEPENDENCIES = "chameleon, audio_board, audio_box"
+DEPENDENCIES = "chameleon, audio_board, audio_box, test_audiojack"
 JOB_RETRIES = 2
 
 DOC = """