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 9452550740..580f0e72a3 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
@@ -275,6 +275,12 @@ import java.util.ArrayList;
       }
     }
 
+    @Override
+    protected boolean codecNeedsSetOutputSurfaceWorkaround(String name) {
+      // Disable all workarounds for testing - devices that require the workaround should fail GTS.
+      return false;
+    }
+
     private void clearTimestamps() {
       startIndex = 0;
       queueSize = 0;