diff --git a/tools/continuous_build/master.cfg b/tools/continuous_build/master.cfg
index d7b458ea70..9203ed9a46 100755
--- a/tools/continuous_build/master.cfg
+++ b/tools/continuous_build/master.cfg
@@ -91,18 +91,19 @@ chrome_scheduler = Scheduler(name='chrome', branch=None, treeStableTimer=60*60,
 c['schedulers'] = [webrtc_scheduler, chrome_scheduler]
 
 ####### TESTS
-# Tests to run on Virtual machine bots and our Mac hardware.
 # Defines the supported tests followed by a tuple defining if the tests are
 # enabled on Linux, Mac and/or Windows (in that order; defined in utils.py).
 
 from webrtc_buildbot import utils
 
+# Normal tests run on Virtual machines for Linux and Windows and physical
+# machines for Mac.
 NORMAL_TESTS = {
     # Test name                        Linux  Mac   Windows
     'audio_coding_module_test':        (True, True, True),
     'audio_coding_unittests':          (True, True, True),
     'audio_conference_mixer_unittests':(True, True, True),
-    'audio_device_test_api':           (True, True, True),
+    'audio_device_test_api':           (False, True, False), # no audio devices
     'audioproc_unittest':              (True, True, True),
     'cng_unittests':                   (True, True, True),
     'g711_unittests':                  (True, True, True),
@@ -132,11 +133,13 @@ NORMAL_TESTS = {
     'webrtc_utility_unittests':        (True, True, True),
 }
 
+# Physical machine tests run on hardware with audio device and webcam present.
 PHYSICAL_MACHINE_TESTS = {
     # Test name                        Linux  Mac   Windows
-    'video_render_module_test':        (True, False, False),
+    'audio_device_test_api':           (True, True, True),
+    'video_render_module_test':        (True, True, True),
     'vie_auto_test':                   (True, False, False),
-    'voe_auto_test':                   (True, False, False),
+    'voe_auto_test':                   (True, True, True),
 }
 
 VALGRIND_DISABLED_TESTS = [