diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc
index 0f07e1fc6c..2525def372 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc
@@ -33,6 +33,11 @@ public:
 void ViEAutoTest::ViEFileStandardTest()
 {
 #ifdef WEBRTC_VIDEO_ENGINE_FILE_API
+    if (!FLAGS_include_timing_dependent_tests) {
+      ViETest::Log("Running in slow execution environment: skipping test...\n");
+      return;
+    }
+
     //***************************************************************
     // Begin create/initialize WebRTC Video Engine for testing
     //***************************************************************
@@ -270,7 +275,6 @@ void ViEAutoTest::ViEFileStandardTest()
         AutoTestSleep(TEST_SPACING);
 
         // GetCaptureDeviceSnapshot
-        if (FLAGS_include_timing_dependent_tests)
         {
             ViETest::Log("Testing GetCaptureDeviceSnapshot(int, ViEPicture)");
             ViETest::Log("Taking a picture to use for displaying ViEPictures "
@@ -318,7 +322,6 @@ void ViEAutoTest::ViEFileStandardTest()
         AutoTestSleep(TEST_SPACING);
 
         // GetCaptureDeviceSnapshot
-        if (FLAGS_include_timing_dependent_tests)
         {
             ViETest::Log("Testing GetCaptureDeviceSnapshot(int, char*)");
             ViETest::Log("Taking snapshot from capture device %d", captureId);
@@ -332,7 +335,6 @@ void ViEAutoTest::ViEFileStandardTest()
         AutoTestSleep(TEST_SPACING);
 
         // testing SetRenderStartImage(videoChannel, renderStartImage);
-        if (FLAGS_include_timing_dependent_tests)
         {
             ViETest::Log("Testing SetRenderStartImage(int, char*)");
             // set render image, then stop capture and stop render to display it
@@ -380,7 +382,6 @@ void ViEAutoTest::ViEFileStandardTest()
 
         // testing SetRenderTimeoutImage(videoChannel, renderTimeoutFile,
         // RENDER_TIMEOUT);
-        if (FLAGS_include_timing_dependent_tests)
         {
             ViETest::Log("Testing SetRenderTimeoutImage(int, char*)");
             ViETest::Log("Stopping capture device to induce timeout of %d ms",
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
index 858a34af97..9ef4ced6c6 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
@@ -256,9 +256,11 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
         tbChannel.videoChannel, sentTotalBitrate, sentVideoBitrate,
          sentFecBitrate, sentNackBitrate));
 
-    EXPECT_GT(sentTotalBitrate, 0u);
-    EXPECT_GE(sentFecBitrate, 10u);
-    EXPECT_EQ(sentNackBitrate, 0u);
+    if (FLAGS_include_timing_dependent_tests) {
+      EXPECT_GT(sentTotalBitrate, 0u);
+      EXPECT_GE(sentFecBitrate, 10u);
+      EXPECT_EQ(sentNackBitrate, 0u);
+    }
 
     EXPECT_EQ(0, ViE.base->StopSend(tbChannel.videoChannel));
     EXPECT_EQ(0, ViE.rtp_rtcp->SetFECStatus(