diff --git a/tools/valgrind-webrtc/gtest_exclude/rtc_unittests.gtest-drmemory.txt b/tools/valgrind-webrtc/gtest_exclude/rtc_unittests.gtest-drmemory.txt
index b533c73e97..b0ac73e01e 100644
--- a/tools/valgrind-webrtc/gtest_exclude/rtc_unittests.gtest-drmemory.txt
+++ b/tools/valgrind-webrtc/gtest_exclude/rtc_unittests.gtest-drmemory.txt
@@ -1,11 +1,6 @@
-# Fails when run under DrMemory.
-# https://code.google.com/p/webrtc/issues/detail?id=3925
-P2PTransportChannelTest.TestOPENToBLOCK_UDPAsIce
-P2PTransportChannelTest.TestIceConfigWillPassDownToPort
-P2PTransportChannelTest.TestIceRoleConflictWithoutBundle
-P2PTransportChannelTest.TestNAT_ADDR_RESTRICTEDToNAT_SYMMETRICAsGiceNoneSharedUfrag
-P2PTransportChannelTest.TestNAT_ADDR_RESTRICTEDToNAT_SYMMETRICAsGiceP0SharedUfrag
-P2PTransportChannelTest.TestNAT_ADDR_RESTRICTEDToNAT_SYMMETRIC_THEN_CONEAsGiceP0SharedUfrag
-P2PTransportChannelTest.TestNAT_FULL_CONEToOPENAsGiceBothSharedUfragWithMinimumStepDelay
-P2PTransportChannelTest.TestNAT_PORT_RESTRICTEDToNAT_SYMMETRIC_THEN_CONEAsIce
-P2PTransportChannelTest.TestNAT_SYMMETRICToNAT_SYMMETRIC_THEN_CONEAsIce
+# Fails on Dr Memory Full.
+# https://code.google.com/p/webrtc/issues/detail?id=3158
+P2PTransportChannel*.*
+PortAllocatorTest.*
+PortTest.*
+PseudoTcpTest.TestSendBothUseLargeWindowScale
diff --git a/tools/valgrind-webrtc/gtest_exclude/rtc_unittests.gtest-memcheck.txt b/tools/valgrind-webrtc/gtest_exclude/rtc_unittests.gtest-memcheck.txt
index a37f70f901..86895e5bef 100644
--- a/tools/valgrind-webrtc/gtest_exclude/rtc_unittests.gtest-memcheck.txt
+++ b/tools/valgrind-webrtc/gtest_exclude/rtc_unittests.gtest-memcheck.txt
@@ -2,4 +2,12 @@
 # https://code.google.com/p/webrtc/issues/detail?id=1976
 PhysicalSocketTest.TestUdpReadyToSendIPv4
 ThreadTest.Release
+# TODO(wu): Reenable P2PTransportChannelTest after issue 2158 is resolved.
+P2PTransportChannelTest.*
+P2PTransportChannelSameNatTest.TestConesBehindSameCone
+PortTest.TestSendStunMessageAsIce
+PseudoTcpTest.TestSendBothUseLargeWindowScale
+# Issue 3447
+P2PTransportChannelMultihomedTest.TestFailover
+P2PTransportChannelMultihomedTest.TestDrain