diff --git a/tools/valgrind-webrtc/gtest_exclude/libjingle_p2p_unittest.gtest-memcheck.txt b/tools/valgrind-webrtc/gtest_exclude/libjingle_p2p_unittest.gtest-memcheck.txt
index d195a513f7..97894d2d49 100644
--- a/tools/valgrind-webrtc/gtest_exclude/libjingle_p2p_unittest.gtest-memcheck.txt
+++ b/tools/valgrind-webrtc/gtest_exclude/libjingle_p2p_unittest.gtest-memcheck.txt
@@ -1,10 +1,4 @@
-# Fails when run under memcheck
-# https://code.google.com/p/webrtc/issues/detail?id=1972
-P2PTransportChannelTest.TestBLOCK_UDPToOPENAsIce
-P2PTransportChannelTest.TestOPENToBLOCK_UDPAsIce
-P2PTransportChannelTest.TestOPENToNAT_FULL_CONEAsGiceNoneSharedUfrag
-P2PTransportChannelTest.TestOPENToNAT_FULL_CONEAsGiceP0SharedUfrag
-P2PTransportChannelTest.TestOPENToNAT_FULL_CONEAsGiceP1SharedUfrag
-P2PTransportChannelTest.TestOPENToNAT_PORT_RESTRICTEDAsIce
+# TODO(wu): Reenable P2PTransportChannelTest after issue 2158 is resolved.
+P2PTransportChannelTest.*
 PortTest.TestSendStunMessageAsIce
 
diff --git a/tools/valgrind-webrtc/gtest_exclude/libjingle_p2p_unittest.gtest-tsan.txt b/tools/valgrind-webrtc/gtest_exclude/libjingle_p2p_unittest.gtest-tsan.txt
index ffbcd4a91f..5fe699e616 100644
--- a/tools/valgrind-webrtc/gtest_exclude/libjingle_p2p_unittest.gtest-tsan.txt
+++ b/tools/valgrind-webrtc/gtest_exclude/libjingle_p2p_unittest.gtest-tsan.txt
@@ -1,2 +1,3 @@
-P2PTransportChannelTest.TestOPENToNAT_FULL_CONEAsGiceNoneSharedUfrag
+# TODO(wu): Reenable P2PTransportChannelTest after issue 2158 is resolved.
+P2PTransportChannelTest.*
 PortTest.TestSendStunMessageAsIce