diff --git a/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java b/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java
index fddb503450..b171b58413 100644
--- a/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java
+++ b/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java
@@ -175,6 +175,12 @@ public class PeerConnectionTest extends TestCase {
     @Override
     public synchronized void onIceConnectionChange(
         IceConnectionState newState) {
+      // TODO(bemasc): remove once delivery of ICECompleted is reliable
+      // (https://code.google.com/p/webrtc/issues/detail?id=3021).
+      if (newState.equals(IceConnectionState.COMPLETED)) {
+        return;
+      }
+
       assertEquals(expectedIceConnectionChanges.removeFirst(), newState);
     }
 
@@ -646,8 +652,11 @@ public class PeerConnectionTest extends TestCase {
         IceConnectionState.CHECKING);
     offeringExpectations.expectIceConnectionChange(
         IceConnectionState.CONNECTED);
-    offeringExpectations.expectIceConnectionChange(
-        IceConnectionState.COMPLETED);
+    // TODO(bemasc): uncomment once delivery of ICECompleted is reliable
+    // (https://code.google.com/p/webrtc/issues/detail?id=3021).
+    //
+    // offeringExpectations.expectIceConnectionChange(
+    //     IceConnectionState.COMPLETED);
     answeringExpectations.expectIceConnectionChange(
         IceConnectionState.CHECKING);
     answeringExpectations.expectIceConnectionChange(