diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java
index 4c5c0a82ec..52df6f937a 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java
@@ -138,11 +138,11 @@ import java.util.ArrayList;
 
       // Two separate issues affect whether MediaFormat changes occur at the correct time.
       // As per [Internal ref: b/149818050, b/149751672], MediaFormat changes can occur early for
-      // SDK 29 and 30. Should be fixed for SDK 31 onwards.
-      // [Internal ref: b/165786766] When using OMX Software decoders, MediaFormat change timestamp
-      // appears to occur early.
+      // SDK 29 and 30.
+      // [Internal ref: b/165786766] When using OMX software decoders, MediaFormat change timestamp
+      // appears to occur early up to API 30.
       shouldMediaFormatChangeTimesBeChecked =
-          (Util.SDK_INT < 29 || Util.SDK_INT > 30) && !codecInfo.name.startsWith("OMX.google");
+          (Util.SDK_INT < 29 && !codecInfo.name.startsWith("OMX.google")) || Util.SDK_INT > 30;
     }
 
     @Override