diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PlayerTestListener.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PlayerTestListener.java
index 9d944fb5f8..57bcafb2d5 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PlayerTestListener.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PlayerTestListener.java
@@ -130,9 +130,15 @@ public final class PlayerTestListener implements Player.Listener, AnalyticsListe
 
   private void waitOrThrow(ConditionVariable conditionVariable)
       throws TimeoutException, PlaybackException {
-    if (!conditionVariable.block(testTimeoutMs)) {
+    maybeThrowPlaybackException();
+    boolean conditionVariableTimedOut = !conditionVariable.block(testTimeoutMs);
+    maybeThrowPlaybackException();
+    if (conditionVariableTimedOut) {
       throw new TimeoutException();
     }
+  }
+
+  private void maybeThrowPlaybackException() throws PlaybackException {
     @Nullable PlaybackException playbackException = this.playbackException.get();
     if (playbackException != null) {
       throw playbackException;