diff --git a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
index cd1520d062..d9c29d5e59 100644
--- a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
+++ b/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
@@ -39,6 +39,25 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 
+// Helper macros for platform disables. These can be chained.
+#ifdef WEBRTC_LINUX
+#define DISABLED_ON_LINUX(test) DISABLED_##test
+#else
+#define DISABLED_ON_LINUX(test) test
+#endif
+
+#ifdef WEBRTC_MAC
+#define DISABLED_ON_MAC(test) DISABLED_##test
+#else
+#define DISABLED_ON_MAC(test) test
+#endif
+
+#ifdef _WIN32
+#define DISABLED_ON_WIN(test) DISABLED_##test
+#else
+#define DISABLED_ON_WIN(test) test
+#endif
+
 // This convenient fixture sets up all voice engine interfaces automatically for
 // use by testing subclasses. It allocates each interface and releases it once
 // which means that if a tests allocates additional interfaces from the voice
diff --git a/webrtc/voice_engine/test/auto_test/standard/file_test.cc b/webrtc/voice_engine/test/auto_test/standard/file_test.cc
index d8e83709a6..99380e6da2 100644
--- a/webrtc/voice_engine/test/auto_test/standard/file_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/file_test.cc
@@ -27,7 +27,7 @@ class FileTest : public AfterStreamingFixture {
 
 TEST_F(FileTest, ManualRecordToFileForThreeSecondsAndPlayback) {
   if (!FLAGS_include_timing_dependent_tests) {
-    TEST_LOG("Skipping test - running in slow execution environment.../n");
+    TEST_LOG("Skipping test - running in slow execution environment...\n");
     return;
   }
 
diff --git a/webrtc/voice_engine/test/auto_test/standard/network_test.cc b/webrtc/voice_engine/test/auto_test/standard/network_test.cc
index 8cc902d179..8bf2d11c9e 100644
--- a/webrtc/voice_engine/test/auto_test/standard/network_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/network_test.cc
@@ -143,9 +143,11 @@ TEST_F(NetworkTest, DoesNotCallDeRegisteredObserver) {
   Sleep(1500);
 }
 
-TEST_F(NetworkTest, DeadOrAliveObserverSeesAliveMessagesIfEnabled) {
+// TODO(phoglund): flaky on Linux
+TEST_F(NetworkTest,
+       DISABLED_ON_LINUX(DeadOrAliveObserverSeesAliveMessagesIfEnabled)) {
   if (!FLAGS_include_timing_dependent_tests) {
-    TEST_LOG("Skipping test - running in slow execution environment.../n");
+    TEST_LOG("Skipping test - running in slow execution environment...\n");
     return;
   }
 
@@ -165,7 +167,7 @@ TEST_F(NetworkTest, DeadOrAliveObserverSeesAliveMessagesIfEnabled) {
 
 TEST_F(NetworkTest, DeadOrAliveObserverSeesDeadMessagesIfEnabled) {
   if (!FLAGS_include_timing_dependent_tests) {
-    TEST_LOG("Skipping test - running in slow execution environment.../n");
+    TEST_LOG("Skipping test - running in slow execution environment...\n");
     return;
   }
 
diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
index a1ecf76b73..3549cb3664 100644
--- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
@@ -140,7 +140,7 @@ void RtcpAppHandler::Reset() {
 
 TEST_F(RtpRtcpTest, RemoteRtcpCnameHasPropagatedToRemoteSide) {
   if (!FLAGS_include_timing_dependent_tests) {
-    TEST_LOG("Skipping test - running in slow execution environment.../n");
+    TEST_LOG("Skipping test - running in slow execution environment...\n");
     return;
   }
 
diff --git a/webrtc/voice_engine/test/auto_test/standard/volume_test.cc b/webrtc/voice_engine/test/auto_test/standard/volume_test.cc
index fda867da10..89e0052b08 100644
--- a/webrtc/voice_engine/test/auto_test/standard/volume_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/volume_test.cc
@@ -10,12 +10,6 @@
 
 #include "after_streaming_fixture.h"
 
-#ifdef WEBRTC_LINUX
-#define DISABLED_ON_LINUX(test) DISABLED_##test
-#else
-#define DISABLED_ON_LINUX(test) test
-#endif
-
 class VolumeTest : public AfterStreamingFixture {
 };