diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/OggPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/OggPlaybackTest.java
index 0a30bc55f1..f95f5f0084 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/OggPlaybackTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/OggPlaybackTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.e2etest;
 
+import android.content.Context;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
@@ -23,6 +24,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;
@@ -55,11 +57,14 @@ public final class OggPlaybackTest {
 
   @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();
-    PlaybackOutput playbackOutput = PlaybackOutput.register(player, mediaCodecConfig);
+    PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
     player.setMediaItem(MediaItem.fromUri("asset:///media/ogg/" + inputFile));
     player.prepare();
@@ -68,8 +73,6 @@ public final class OggPlaybackTest {
     player.release();
 
     DumpFileAsserts.assertOutput(
-        ApplicationProvider.getApplicationContext(),
-        playbackOutput,
-        "playbackdumps/ogg/" + inputFile + ".dump");
+        applicationContext, playbackOutput, "playbackdumps/ogg/" + inputFile + ".dump");
   }
 }
diff --git a/testdata/src/test/assets/playbackdumps/ogg/bear.opus.dump b/testdata/src/test/assets/playbackdumps/ogg/bear.opus.dump
index bdda86589a..a832a634d8 100644
--- a/testdata/src/test/assets/playbackdumps/ogg/bear.opus.dump
+++ b/testdata/src/test/assets/playbackdumps/ogg/bear.opus.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/opus):
+MediaCodecAdapter (exotest.audio.opus):
   buffers.length = 276
   buffers[0] = length 234, hash B77BFFDA
   buffers[1] = length 165, hash F7B07C35
diff --git a/testdata/src/test/assets/playbackdumps/ogg/bear_flac.ogg.dump b/testdata/src/test/assets/playbackdumps/ogg/bear_flac.ogg.dump
index aa6cfbc9e1..36a685ba05 100644
--- a/testdata/src/test/assets/playbackdumps/ogg/bear_flac.ogg.dump
+++ b/testdata/src/test/assets/playbackdumps/ogg/bear_flac.ogg.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/flac):
+MediaCodecAdapter (exotest.audio.flac):
   buffers.length = 34
   buffers[0] = length 5030, hash D2B60530
   buffers[1] = length 5066, hash 4C932A54
diff --git a/testdata/src/test/assets/playbackdumps/ogg/bear_flac_noseektable.ogg.dump b/testdata/src/test/assets/playbackdumps/ogg/bear_flac_noseektable.ogg.dump
index aa6cfbc9e1..36a685ba05 100644
--- a/testdata/src/test/assets/playbackdumps/ogg/bear_flac_noseektable.ogg.dump
+++ b/testdata/src/test/assets/playbackdumps/ogg/bear_flac_noseektable.ogg.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/flac):
+MediaCodecAdapter (exotest.audio.flac):
   buffers.length = 34
   buffers[0] = length 5030, hash D2B60530
   buffers[1] = length 5066, hash 4C932A54
diff --git a/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis.ogg.dump b/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis.ogg.dump
index 0f71cbee83..b51724db16 100644
--- a/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis.ogg.dump
+++ b/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis.ogg.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/vorbis):
+MediaCodecAdapter (exotest.audio.vorbis):
   buffers.length = 181
   buffers[0] = length 49, hash 2FFF94F0
   buffers[1] = length 44, hash 3946418A
diff --git a/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis_gap.ogg.dump b/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis_gap.ogg.dump
index 0f71cbee83..b51724db16 100644
--- a/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis_gap.ogg.dump
+++ b/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis_gap.ogg.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/vorbis):
+MediaCodecAdapter (exotest.audio.vorbis):
   buffers.length = 181
   buffers[0] = length 49, hash 2FFF94F0
   buffers[1] = length 44, hash 3946418A
diff --git a/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis_with_large_metadata.ogg.dump b/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis_with_large_metadata.ogg.dump
index 0f71cbee83..b51724db16 100644
--- a/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis_with_large_metadata.ogg.dump
+++ b/testdata/src/test/assets/playbackdumps/ogg/bear_vorbis_with_large_metadata.ogg.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/vorbis):
+MediaCodecAdapter (exotest.audio.vorbis):
   buffers.length = 181
   buffers[0] = length 49, hash 2FFF94F0
   buffers[1] = length 44, hash 3946418A