diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index a648ef7fb1..08389c51fe 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -934,7 +934,7 @@ public final class ExoPlayerTest {
   }
 
   @Test
-  public void setPlaybackParametersBeforePreparationCompletesSucceeds() throws Exception {
+  public void setPlaybackSpeedBeforePreparationCompletesSucceeds() throws Exception {
     // Test that no exception is thrown when playback parameters are updated between creating a
     // period and preparation of the period completing.
     final CountDownLatch createPeriodCalledCountDownLatch = new CountDownLatch(1);
@@ -3335,7 +3335,7 @@ public final class ExoPlayerTest {
   }
 
   @Test
-  public void setPlaybackParametersConsecutivelyNotifiesListenerForEveryChangeOnceAndIsMasked()
+  public void setPlaybackSpeedConsecutivelyNotifiesListenerForEveryChangeOnceAndIsMasked()
       throws Exception {
     List<Float> maskedPlaybackSpeeds = new ArrayList<>();
     Action getPlaybackSpeedAction =
@@ -3381,7 +3381,7 @@ public final class ExoPlayerTest {
 
   @Test
   public void
-      setUnsupportedPlaybackParametersConsecutivelyNotifiesListenerForEveryChangeOnceAndResetsOnceHandled()
+      setUnsupportedPlaybackSpeedConsecutivelyNotifiesListenerForEveryChangeOnceAndResetsOnceHandled()
           throws Exception {
     Renderer renderer =
         new FakeMediaClockRenderer(C.TRACK_TYPE_AUDIO) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
index 6587614b50..b64b14e501 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
@@ -96,7 +96,7 @@ public final class DefaultAudioSinkTest {
   }
 
   @Test
-  public void handlesBufferAfterReset_withPlaybackParameters() throws Exception {
+  public void handlesBufferAfterReset_withPlaybackSpeed() throws Exception {
     defaultAudioSink.setPlaybackSpeed(/* playbackSpeed= */ 1.5f);
     configureDefaultAudioSink(CHANNEL_COUNT_STEREO);
     defaultAudioSink.handleBuffer(
@@ -124,7 +124,7 @@ public final class DefaultAudioSinkTest {
   }
 
   @Test
-  public void handlesBufferAfterReset_withFormatChangeAndPlaybackParameters() throws Exception {
+  public void handlesBufferAfterReset_withFormatChangeAndPlaybackSpeed() throws Exception {
     defaultAudioSink.setPlaybackSpeed(/* playbackSpeed= */ 1.5f);
     configureDefaultAudioSink(CHANNEL_COUNT_STEREO);
     defaultAudioSink.handleBuffer(