diff --git a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java
index eef3bf1d71..88520da948 100644
--- a/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java
+++ b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java
@@ -22,6 +22,8 @@ import static com.google.common.truth.Truth.assertThat;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.VideoFrameProcessorTestRunner;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@@ -57,8 +59,8 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest {
 
   @RequiresNonNull("framesProduced")
   @Test
-  public void imageInput_queueThreeBitmaps_outputsAllFrames() throws Exception {
-    String testId = "imageInput_withThreeBitmaps_outputsAllFrames";
+  public void imageInput_queueThreeBitmaps_outputsCorrectNumberOfFrames() throws Exception {
+    String testId = "imageInput_queueThreeBitmaps_outputsCorrectNumberOfFrames";
     videoFrameProcessorTestRunner = getDefaultFrameProcessorTestRunnerBuilder(testId).build();
 
     videoFrameProcessorTestRunner.queueInputBitmap(
@@ -75,8 +77,8 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest {
 
   @RequiresNonNull("framesProduced")
   @Test
-  public void imageInput_queueTwentyBitmaps_outputsAllFrames() throws Exception {
-    String testId = "imageInput_queueTwentyBitmaps_outputsAllFrames";
+  public void imageInput_queueTwentyBitmaps_outputsCorrectNumberOfFrames() throws Exception {
+    String testId = "imageInput_queueTwentyBitmaps_outputsCorrectNumberOfFrames";
     videoFrameProcessorTestRunner = getDefaultFrameProcessorTestRunnerBuilder(testId).build();
 
     for (int i = 0; i < 20; i++) {
@@ -93,9 +95,16 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest {
 
   @RequiresNonNull("framesProduced")
   @Test
-  public void imageInput_queueEndAndQueueAgain_outputsFirstSetOfFramesOnly() throws Exception {
-    String testId = "imageInput_queueEndAndQueueAgain_outputsFirstSetOfFramesOnly";
-    videoFrameProcessorTestRunner = getDefaultFrameProcessorTestRunnerBuilder(testId).build();
+  public void
+      imageInput_queueEndAndQueueAgain_outputsFirstSetOfFramesOnlyAtTheCorrectPresentationTimesUs()
+          throws Exception {
+    String testId =
+        "imageInput_queueEndAndQueueAgain_outputsFirstSetOfFramesOnlyAtTheCorrectPresentationTimesUs";
+    Queue<Long> actualPresentationTimesUs = new ConcurrentLinkedQueue<>();
+    videoFrameProcessorTestRunner =
+        getDefaultFrameProcessorTestRunnerBuilder(testId)
+            .setOnOutputFrameAvailableListener(actualPresentationTimesUs::add)
+            .build();
 
     videoFrameProcessorTestRunner.queueInputBitmap(
         readBitmap(ORIGINAL_PNG_ASSET_PATH),
@@ -107,8 +116,7 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest {
         /* durationUs= */ 2 * C.MICROS_PER_SECOND,
         /* frameRate= */ 3);
 
-    int actualFrameCount = framesProduced.get();
-    assertThat(actualFrameCount).isEqualTo(/* expected= */ 2);
+    assertThat(actualPresentationTimesUs).containsExactly(0L, C.MICROS_PER_SECOND / 2).inOrder();
   }
 
   private VideoFrameProcessorTestRunner.Builder getDefaultFrameProcessorTestRunnerBuilder(
@@ -117,6 +125,7 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest {
         .setTestId(testId)
         .setVideoFrameProcessorFactory(new DefaultVideoFrameProcessor.Factory())
         .setIsInputTextureExternal(false)
-        .setOnFrameAvailableListener((unused) -> checkNotNull(framesProduced).incrementAndGet());
+        .setOnOutputFrameAvailableListener(
+            unused -> checkNotNull(framesProduced).incrementAndGet());
   }
 }
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/VideoFrameProcessorTestRunner.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/VideoFrameProcessorTestRunner.java
index c7a339efc1..4e13b9dfc6 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/VideoFrameProcessorTestRunner.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/VideoFrameProcessorTestRunner.java
@@ -67,7 +67,7 @@ public final class VideoFrameProcessorTestRunner {
     public Builder() {
       pixelWidthHeightRatio = DEFAULT_PIXEL_WIDTH_HEIGHT_RATIO;
       isInputTextureExternal = true;
-      onOutputFrameAvailableListener = (unused) -> {};
+      onOutputFrameAvailableListener = unused -> {};
     }
 
     /**
@@ -189,7 +189,7 @@ public final class VideoFrameProcessorTestRunner {
      * <p>The default value is a no-op.
      */
     @CanIgnoreReturnValue
-    public Builder setOnFrameAvailableListener(
+    public Builder setOnOutputFrameAvailableListener(
         OnOutputFrameAvailableListener onOutputFrameAvailableListener) {
       this.onOutputFrameAvailableListener = onOutputFrameAvailableListener;
       return this;