diff --git a/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc
index a1e9fa710..818551d47 100644
--- a/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc
+++ b/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc
@@ -30,8 +30,14 @@ TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest),
   tests_->ViECaptureExtendedTest();
 }
 
-TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest),
-       RunsCodecTestWithoutErrors) {
+// Flaky on Windows: http://code.google.com/p/webrtc/issues/detail?id=1925
+// (in addition to being disabled on Mac due to webrtc:1268).
+#if defined(WEBRTC_MAC) || defined(_WIN32)
+#define MAYBE_RunsCodecTestWithoutErrors DISABLED_RunsCodecTestWithoutErrors
+#else
+#define MAYBE_RunsCodecTestWithoutErrors RunsCodecTestWithoutErrors
+#endif
+TEST_F(ViEExtendedIntegrationTest, MAYBE_RunsCodecTestWithoutErrors) {
   tests_->ViECodecExtendedTest();
 }