diff --git a/tools/continuous_build/master.cfg b/tools/continuous_build/master.cfg
index 751937a70..b01445c31 100755
--- a/tools/continuous_build/master.cfg
+++ b/tools/continuous_build/master.cfg
@@ -111,29 +111,32 @@ from webrtc_buildbot import utils
 # enabled on Linux, Mac and/or Windows (in that order; defined in utils.py).
 NORMAL_TESTS = {
     # Test name                        Linux  Mac   Windows
-    "audio_coding_module_test":        (True, True, False),
+    "audio_coding_module_test":        (True, True, True),
     "audio_coding_unittests":          (True, True, True),
-    "audio_conference_mixer_unittests":(True, True, False),
-    "audio_device_test_api":           (True, True, False),
+    "audio_conference_mixer_unittests":(True, True, True),
+    "audio_device_test_api":           (True, False, False), # Issue 257
     "audioproc_unittest":              (True, True, True),
     "cng_unittests":                   (True, True, True),
     "g711_unittests":                  (True, True, True),
     "g722_unittests":                  (True, True, True),
     "libyuv_unittests":                (True, True, True),
-    "media_file_unittests":            (True, True, False),
+    "media_file_unittests":            (True, True, True),
     "neteq_unittests":                 (True, True, True),
     "pcm16b_unittests":                (True, True, True),
     "resampler_unittests":             (True, True, True),
-    "rtp_rtcp_unittests":              (True, True, False),
-    "signal_processing_unittests":     (True, True, False),
+    "rtp_rtcp_unittests":              (True, True, True),
+    "signal_processing_unittests":     (True, True, False), # Issue 258
     "system_wrappers_unittests":       (True, True, True),
-    "test_bwe":                        (True, True, False),
-    "test_fec":                        (False, False, False),
-    "udp_transport_unittests":         (True, True, False),
+    "test_bwe":                        (True, True, True),
+    "test_fec":                        (True, True, True),
+    "test_support_unittests":          (True, True, True),
+    "udp_transport_unittests":         (True, True, True),
     "vad_unittests":                   (True, True, True),
-    "video_coding_unittests":          (True, True, False),
+    "video_codecs_test_framework_integrationtests": (True, True, True),
+    "video_codecs_test_framework_unittests":        (False, False, False), # Issue 260
+    "video_coding_unittests":          (True, True, False), # Issue 259
     "video_engine_core_unittests":     (True, True, True),
-    "video_processing_unittests":      (True, True, False), # Issue #247
+    "video_processing_unittests":      (True, True, True),
     "voice_engine_unittests":          (True, True, True),
     "vp8_unittests":                   (True, True, True),
     "webrtc_utility_unittests":        (True, True, False),