diff --git a/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-drmemory_win32.txt b/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-drmemory_win32.txt
index 965ef0026..ff0d3169e 100644
--- a/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-drmemory_win32.txt
+++ b/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-drmemory_win32.txt
@@ -1,17 +1,18 @@
-# Too slow to run with Dr Memory on Windows.
-ApmTest.EchoCancellationReportsCorrectDelays
-ApmTest.FloatAndIntInterfacesGiveIdenticalResults
-ApmTest.IdenticalInputChannelsResultInIdenticalOutputChannels
-ApmTest.VerifyDebugDumpFloat
-ApmTest.VerifyDebugDumpInt
-TestScaler.PointScaleTest
-TestScaler.BiLinearScaleTest
-TestScaler.BoxScaleTest
-TestVideoSenderWithVp8.*
-TestVp8Impl.BaseUnitTest
-VideoProcessingModuleTest.Denoising
-VideoProcessorIntegrationTest.ProcessNoLossChangeBitRate
-VideoSendersTest.*
-
-# https://code.google.com/p/webrtc/issues/detail?id=2323
-MouseCursorShapeTest.MatchCursors
+# Too slow to run with Dr Memory on Windows.
+ApmTest.EchoCancellationReportsCorrectDelays
+ApmTest.FloatAndIntInterfacesGiveIdenticalResults
+ApmTest.IdenticalInputChannelsResultInIdenticalOutputChannels
+ApmTest.VerifyDebugDumpFloat
+ApmTest.VerifyDebugDumpInt
+CommonFormats/AudioProcessingTest*
+TestScaler.PointScaleTest
+TestScaler.BiLinearScaleTest
+TestScaler.BoxScaleTest
+TestVideoSenderWithVp8.*
+TestVp8Impl.BaseUnitTest
+VideoProcessingModuleTest.Denoising
+VideoProcessorIntegrationTest.ProcessNoLossChangeBitRate
+VideoSendersTest.*
+
+# https://code.google.com/p/webrtc/issues/detail?id=2323
+MouseCursorShapeTest.MatchCursors
diff --git a/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-memcheck.txt b/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-memcheck.txt
new file mode 100644
index 000000000..8588487ae
--- /dev/null
+++ b/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-memcheck.txt
@@ -0,0 +1,2 @@
+# Tests that are too slow.
+CommonFormats/AudioProcessingTest*
diff --git a/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-tsan.txt b/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-tsan.txt
new file mode 100644
index 000000000..8588487ae
--- /dev/null
+++ b/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-tsan.txt
@@ -0,0 +1,2 @@
+# Tests that are too slow.
+CommonFormats/AudioProcessingTest*
diff --git a/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-tsan_win32.txt b/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-tsan_win32.txt
index f7b011599..af6b46156 100644
--- a/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-tsan_win32.txt
+++ b/tools/valgrind-webrtc/gtest_exclude/modules_unittests.gtest-tsan_win32.txt
@@ -1,16 +1,17 @@
-# Too slow to run with TSan on Windows.
-ApmTest.EchoCancellationReportsCorrectDelays
-ApmTest.IdenticalInputChannelsResultInIdenticalOutputChannels
-RingBufferTest.RandomStressTest
-RingBufferTest.RandomStressTestWithNullPtr
-VideoProcessingModuleTest.ContentAnalysis
-VideoProcessingModuleTest.Deflickering
-VideoProcessingModuleTest.Denoising
-TestVideoSenderWithVp8.*
-
-# https://code.google.com/p/webrtc/issues/detail?id=1938
-MouseCursorShapeTest.MatchCursors
-
-# https://code.google.com/p/webrtc/issues/detail?id=2329
-NetEqDecodingTest.TestBitExactness
-NetEqDecodingTest.TestNetworkStatistics
+# Too slow to run with TSan on Windows.
+ApmTest.EchoCancellationReportsCorrectDelays
+ApmTest.IdenticalInputChannelsResultInIdenticalOutputChannels
+CommonFormats/AudioProcessingTest*
+RingBufferTest.RandomStressTest
+RingBufferTest.RandomStressTestWithNullPtr
+VideoProcessingModuleTest.ContentAnalysis
+VideoProcessingModuleTest.Deflickering
+VideoProcessingModuleTest.Denoising
+TestVideoSenderWithVp8.*
+
+# https://code.google.com/p/webrtc/issues/detail?id=1938
+MouseCursorShapeTest.MatchCursors
+
+# https://code.google.com/p/webrtc/issues/detail?id=2329
+NetEqDecodingTest.TestBitExactness
+NetEqDecodingTest.TestNetworkStatistics