diff --git a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java b/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java
index 9fe1ba3dc8..e473e97651 100644
--- a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java
+++ b/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java
@@ -14,9 +14,9 @@ import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.LargeTest;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.SmallTest;
 
 public class Camera1CapturerUsingByteBufferTest extends InstrumentationTestCase {
   static final String TAG = "Camera1CapturerUsingByteBufferTest";
@@ -141,7 +141,7 @@ public class Camera1CapturerUsingByteBufferTest extends InstrumentationTestCase
   // been stopped and restarted. It does not test or use the C++ layer.
   @LargeTest
   public void testReturnBufferLate() throws InterruptedException {
-    fixtures.returnBufferLateEndToEnd();
+    fixtures.returnBufferLate();
   }
 
   // This test that we can capture frames, keep the frames in a local renderer, stop capturing,
diff --git a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java b/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java
index 614105cd5d..473b3d43c4 100644
--- a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java
+++ b/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java
@@ -14,9 +14,9 @@ import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.LargeTest;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.SmallTest;
 
 public class Camera1CapturerUsingTextureTest extends InstrumentationTestCase {
   static final String TAG = "Camera1CapturerUsingTextureTest";
@@ -129,7 +129,7 @@ public class Camera1CapturerUsingTextureTest extends InstrumentationTestCase {
   // been stopped and restarted. It does not test or use the C++ layer.
   @LargeTest
   public void testReturnBufferLate() throws InterruptedException {
-    fixtures.returnBufferLateEndToEnd();
+    fixtures.returnBufferLate();
   }
 
   // This test that we can capture frames, keep the frames in a local renderer, stop capturing,
diff --git a/webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java b/webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java
index 7ad60c05e7..0dc1080d8f 100644
--- a/webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java
+++ b/webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java
@@ -13,15 +13,15 @@ package org.webrtc;
 import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
 
 import android.content.Context;
+import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CameraAccessException;
 import android.os.Handler;
 import android.os.Looper;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.LargeTest;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.SmallTest;
 
 import java.util.concurrent.CountDownLatch;
 
@@ -253,7 +253,7 @@ public class Camera2CapturerTest extends InstrumentationTestCase {
   // been stopped and restarted. It does not test or use the C++ layer.
   @LargeTest
   public void testReturnBufferLate() throws InterruptedException {
-    fixtures.returnBufferLateEndToEnd();
+    fixtures.returnBufferLate();
   }
 
   // This test that we can capture frames, keep the frames in a local renderer, stop capturing,