diff --git a/talk/base/physicalsocketserver_unittest.cc b/talk/base/physicalsocketserver_unittest.cc
index cbdbd9cad..a27b98073 100644
--- a/talk/base/physicalsocketserver_unittest.cc
+++ b/talk/base/physicalsocketserver_unittest.cc
@@ -147,10 +147,16 @@ TEST_F(PhysicalSocketTest, TestUdpIPv6) {
   SocketTest::TestUdpIPv6();
 }
 
+// Disable for TSan v2, see
+// https://code.google.com/p/webrtc/issues/detail?id=3498 for details.
+#if !defined(THREAD_SANITIZER)
+
 TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv4) {
   SocketTest::TestUdpReadyToSendIPv4();
 }
 
+#endif // if !defined(THREAD_SANITIZER)
+
 TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv6) {
   SocketTest::TestUdpReadyToSendIPv6();
 }