diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java
index 4502b688ff..749789247c 100644
--- a/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java
+++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java
@@ -37,7 +37,7 @@ import androidx.media3.common.FrameInfo;
 import androidx.media3.common.FrameProcessingException;
 import androidx.media3.common.FrameProcessor;
 import androidx.media3.common.SurfaceInfo;
-import androidx.media3.test.utils.DecodeOneFrameTestUtil;
+import androidx.media3.test.utils.DecodeOneFrameUtil;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
@@ -464,9 +464,9 @@ public final class GlEffectsFrameProcessorPixelTest {
                     DebugViewProvider.NONE,
                     ColorInfo.SDR_BT709_LIMITED,
                     /* releaseFramesAutomatically= */ true));
-    DecodeOneFrameTestUtil.decodeOneAssetFileFrame(
+    DecodeOneFrameUtil.decodeOneAssetFileFrame(
         INPUT_MP4_ASSET_STRING,
-        new DecodeOneFrameTestUtil.Listener() {
+        new DecodeOneFrameUtil.Listener() {
           @Override
           public void onContainerExtracted(MediaFormat mediaFormat) {
             glEffectsFrameProcessor.setInputFrameInfo(
diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DecodeOneFrameTestUtil.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DecodeOneFrameUtil.java
similarity index 98%
rename from libraries/test_utils/src/main/java/androidx/media3/test/utils/DecodeOneFrameTestUtil.java
rename to libraries/test_utils/src/main/java/androidx/media3/test/utils/DecodeOneFrameUtil.java
index 5d2acf4c0d..c11cf54d96 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DecodeOneFrameTestUtil.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DecodeOneFrameUtil.java
@@ -35,7 +35,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
 /** Utilities for decoding a frame for tests. */
 @UnstableApi
-public class DecodeOneFrameTestUtil {
+public class DecodeOneFrameUtil {
 
   /** Listener for decoding events. */
   public interface Listener {
@@ -173,5 +173,5 @@ public class DecodeOneFrameTestUtil {
     }
   }
 
-  private DecodeOneFrameTestUtil() {}
+  private DecodeOneFrameUtil() {}
 }
diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RepeatedTranscodeTransformationTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RepeatedTranscodeTest.java
similarity index 99%
rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RepeatedTranscodeTransformationTest.java
rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RepeatedTranscodeTest.java
index 0c275ad1ef..9ed3ae62eb 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RepeatedTranscodeTransformationTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/RepeatedTranscodeTest.java
@@ -35,7 +35,7 @@ import org.junit.runner.RunWith;
 
 /** Tests repeated transcoding operations (as a stress test and to help reproduce flakiness). */
 @RunWith(AndroidJUnit4.class)
-public final class RepeatedTranscodeTransformationTest {
+public final class RepeatedTranscodeTest {
   private static final int TRANSCODE_COUNT = 10;
 
   @Test
diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetFrameEditTransformationTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetFrameEditTest.java
similarity index 97%
rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetFrameEditTransformationTest.java
rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetFrameEditTest.java
index 1322935959..8d654ae6c9 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetFrameEditTransformationTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetFrameEditTest.java
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
 
 /** {@link Transformer} instrumentation test for applying a frame edit. */
 @RunWith(AndroidJUnit4.class)
-public class SetFrameEditTransformationTest {
+public class SetFrameEditTest {
   @Test
   public void setFrameEditTransform() throws Exception {
     Context context = ApplicationProvider.getApplicationContext();
diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTransformationTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTest.java
similarity index 97%
rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTransformationTest.java
rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTest.java
index 3d54bc9e72..2eb9d6012a 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTransformationTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTest.java
@@ -20,7 +20,7 @@ import static androidx.media3.common.util.Assertions.checkNotNull;
 import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_1_SECOND_HDR10_VIDEO_SDR_CONTAINER;
 import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_4_SECOND_HDR10;
 import static androidx.media3.transformer.AndroidTestUtil.recordTestSkipped;
-import static androidx.media3.transformer.mh.analysis.FileTestUtil.assertFileHasColorTransfer;
+import static androidx.media3.transformer.mh.analysis.FileUtil.assertFileHasColorTransfer;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
@@ -45,8 +45,8 @@ import org.junit.runner.RunWith;
 // TODO(b/239172735): Add HLG tests after finding a shareable HLG file.
 /** {@link Transformer} instrumentation test for applying an HDR frame edit. */
 @RunWith(AndroidJUnit4.class)
-public class SetHdrEditingTransformationTest {
-  public static final String TAG = "SetHdrEditingTransformationTest";
+public class SetHdrEditingTest {
+  public static final String TAG = "SetHdrEditingTest";
   private static final ColorInfo HDR10_DEFAULT_COLOR_INFO =
       new ColorInfo(
           C.COLOR_SPACE_BT2020,
diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrToSdrToneMapTransformationTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrToSdrToneMapTest.java
similarity index 96%
rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrToSdrToneMapTransformationTest.java
rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrToSdrToneMapTest.java
index 4312ac800b..22b9e4d458 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrToSdrToneMapTransformationTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrToSdrToneMapTest.java
@@ -17,7 +17,7 @@ package androidx.media3.transformer.mh;
 
 import static androidx.media3.common.util.Assertions.checkNotNull;
 import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_1080P_4_SECOND_HDR10;
-import static androidx.media3.transformer.mh.analysis.FileTestUtil.assertFileHasColorTransfer;
+import static androidx.media3.transformer.mh.analysis.FileUtil.assertFileHasColorTransfer;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
@@ -39,8 +39,8 @@ import org.junit.runner.RunWith;
 // TODO(b/239172735): Add HLG tests after finding a shareable HLG file.
 /** {@link Transformer} instrumentation test for applying an HDR to SDR tone mapping edit. */
 @RunWith(AndroidJUnit4.class)
-public class SetHdrToSdrToneMapTransformationTest {
-  public static final String TAG = "SetHdrToSdrToneMapTransformationTest";
+public class SetHdrToSdrToneMapTest {
+  public static final String TAG = "SetHdrToSdrToneMapTest";
 
   @Test
   public void transform_toneMapNoRequestedTranscode_hdr10File_toneMapsOrThrows() throws Exception {
diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/FileTestUtil.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/FileUtil.java
similarity index 90%
rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/FileTestUtil.java
rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/FileUtil.java
index 7347bee3fc..75585459a4 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/FileTestUtil.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/FileUtil.java
@@ -25,10 +25,10 @@ import androidx.media3.common.C;
 import androidx.media3.common.ColorInfo;
 import androidx.media3.common.util.MediaFormatUtil;
 import androidx.media3.common.util.Util;
-import androidx.media3.test.utils.DecodeOneFrameTestUtil;
+import androidx.media3.test.utils.DecodeOneFrameUtil;
 
 /** Utilities for reading color info from a file. */
-public class FileTestUtil {
+public class FileUtil {
   public static void assertFileHasColorTransfer(
       @Nullable String filePath, @C.ColorTransfer int expectedColorTransfer) throws Exception {
     if (Util.SDK_INT < 29) {
@@ -36,9 +36,9 @@ public class FileTestUtil {
       // required for MediaFormatUtil#getColorInfo.
       return;
     }
-    DecodeOneFrameTestUtil.decodeOneCacheFileFrame(
+    DecodeOneFrameUtil.decodeOneCacheFileFrame(
         checkNotNull(filePath),
-        new DecodeOneFrameTestUtil.Listener() {
+        new DecodeOneFrameUtil.Listener() {
           @Override
           public void onContainerExtracted(MediaFormat mediaFormat) {
             @Nullable ColorInfo extractedColor = MediaFormatUtil.getColorInfo(mediaFormat);
@@ -54,5 +54,5 @@ public class FileTestUtil {
         /* surface= */ null);
   }
 
-  private FileTestUtil() {}
+  private FileUtil() {}
 }