diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 4eeba6aa84..92949cf0cb 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -821,6 +821,7 @@ if (rtc_include_tests) {
       ]
 
       deps = [
+        "//base:base_java_test_support",
         "//webrtc/api:libjingle_peerconnection_java",
         "//webrtc/api:libjingle_peerconnection_jni",
         "//webrtc/examples:AppRTCMobile_javalib",
diff --git a/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java b/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java
index b20157fea5..61ffa021b5 100644
--- a/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java
+++ b/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java
@@ -15,6 +15,7 @@ import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.After;
 import org.junit.Before;
@@ -96,7 +97,10 @@ public class TCPChannelClientTest {
     verify(clientEvents, timeout(CONNECT_TIMEOUT)).onTCPConnected(false);
   }
 
-  @Test
+  // @Test
+  // Disabled because it fails when IPv6 is not supported on the bot.
+  // TODO(ehmaldonado): Enable when bugs.webrtc.org/6437 is fixed.
+  @DisabledTest
   public void testConnectIPv6() {
     setUpIPv6Server();
     try {