diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Vp9PlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Vp9PlaybackTest.java
index b44c36b04e..1d0fc0cb4d 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Vp9PlaybackTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/Vp9PlaybackTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.e2etest;
 
+import android.content.Context;
 import android.graphics.SurfaceTexture;
 import android.view.Surface;
 import androidx.test.core.app.ApplicationProvider;
@@ -25,6 +26,7 @@ import com.google.android.exoplayer2.robolectric.PlaybackOutput;
 import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
 import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
 import com.google.android.exoplayer2.testutil.AutoAdvancingFakeClock;
+import com.google.android.exoplayer2.testutil.CapturingRenderersFactory;
 import com.google.android.exoplayer2.testutil.DumpFileAsserts;
 import com.google.common.collect.ImmutableList;
 import org.junit.Rule;
@@ -56,12 +58,15 @@ public final class Vp9PlaybackTest {
 
   @Test
   public void test() throws Exception {
+    Context applicationContext = ApplicationProvider.getApplicationContext();
+    CapturingRenderersFactory capturingRenderersFactory =
+        new CapturingRenderersFactory(applicationContext);
     SimpleExoPlayer player =
-        new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext())
+        new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory)
             .setClock(new AutoAdvancingFakeClock())
             .build();
     player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1)));
-    PlaybackOutput playbackOutput = PlaybackOutput.register(player, mediaCodecConfig);
+    PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
     player.setMediaItem(MediaItem.fromUri("asset:///media/vp9/" + inputFile));
     player.prepare();
@@ -70,8 +75,6 @@ public final class Vp9PlaybackTest {
     player.release();
 
     DumpFileAsserts.assertOutput(
-        ApplicationProvider.getApplicationContext(),
-        playbackOutput,
-        "playbackdumps/vp9/" + inputFile + ".dump");
+        applicationContext, playbackOutput, "playbackdumps/vp9/" + inputFile + ".dump");
   }
 }
diff --git a/testdata/src/test/assets/playbackdumps/vp9/bear-vp9-odd-dimensions.webm.dump b/testdata/src/test/assets/playbackdumps/vp9/bear-vp9-odd-dimensions.webm.dump
index 72476f023f..5e3dc20cf3 100644
--- a/testdata/src/test/assets/playbackdumps/vp9/bear-vp9-odd-dimensions.webm.dump
+++ b/testdata/src/test/assets/playbackdumps/vp9/bear-vp9-odd-dimensions.webm.dump
@@ -1,4 +1,4 @@
-MediaCodec (video/x-vnd.on2.vp9):
+MediaCodecAdapter (exotest.video.vp9):
   buffers.length = 31
   buffers[0] = length 10658, hash E48B4B1D
   buffers[1] = length 5866, hash 59922F8F
diff --git a/testdata/src/test/assets/playbackdumps/vp9/bear-vp9.webm.dump b/testdata/src/test/assets/playbackdumps/vp9/bear-vp9.webm.dump
index d0515dc610..ce6346fbec 100644
--- a/testdata/src/test/assets/playbackdumps/vp9/bear-vp9.webm.dump
+++ b/testdata/src/test/assets/playbackdumps/vp9/bear-vp9.webm.dump
@@ -1,4 +1,4 @@
-MediaCodec (video/x-vnd.on2.vp9):
+MediaCodecAdapter (exotest.video.vp9):
   buffers.length = 83
   buffers[0] = length 3792, hash 70319132
   buffers[1] = length 64, hash 2661DD32
diff --git a/testdata/src/test/assets/playbackdumps/vp9/invalid-bitstream.webm.dump b/testdata/src/test/assets/playbackdumps/vp9/invalid-bitstream.webm.dump
index 8c64783eec..bc9148ff9a 100644
--- a/testdata/src/test/assets/playbackdumps/vp9/invalid-bitstream.webm.dump
+++ b/testdata/src/test/assets/playbackdumps/vp9/invalid-bitstream.webm.dump
@@ -1,4 +1,4 @@
-MediaCodec (video/x-vnd.on2.vp9):
+MediaCodecAdapter (exotest.video.vp9):
   buffers.length = 52
   buffers[0] = length 17828, hash 64E34D2F
   buffers[1] = length 51, hash 5A1B8385
diff --git a/testdata/src/test/assets/playbackdumps/vp9/roadtrip-vp92-10bit.webm.dump b/testdata/src/test/assets/playbackdumps/vp9/roadtrip-vp92-10bit.webm.dump
index a956ba7acf..fd382ef9ef 100644
--- a/testdata/src/test/assets/playbackdumps/vp9/roadtrip-vp92-10bit.webm.dump
+++ b/testdata/src/test/assets/playbackdumps/vp9/roadtrip-vp92-10bit.webm.dump
@@ -1,4 +1,4 @@
-MediaCodec (video/x-vnd.on2.vp9):
+MediaCodecAdapter (exotest.video.vp9):
   buffers.length = 81
   buffers[0] = length 2673, hash 35AEF916
   buffers[1] = length 5013, hash 3F74CFB8