diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
index 80e7383d12..0cd27a90c0 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
@@ -53,7 +53,7 @@ public final class AdPlaybackStateTest {
 
     assertThat(state.adGroups[0].uris[0]).isNull();
     assertThat(state.adGroups[0].states[0]).isEqualTo(AdPlaybackState.AD_STATE_UNAVAILABLE);
-    assertThat(state.adGroups[0].uris[1]).isSameAs(TEST_URI);
+    assertThat(state.adGroups[0].uris[1]).isSameInstanceAs(TEST_URI);
     assertThat(state.adGroups[0].states[1]).isEqualTo(AdPlaybackState.AD_STATE_AVAILABLE);
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
index 747cbd0c7b..8785229b7c 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
@@ -45,7 +45,7 @@ public final class TtmlRenderUtilTest {
     String[] styleIds = {"s0"};
 
     assertThat(TtmlRenderUtil.resolveStyle(null, styleIds, globalStyles))
-        .isSameAs(globalStyles.get("s0"));
+        .isSameInstanceAs(globalStyles.get("s0"));
   }
 
   @Test
@@ -74,7 +74,7 @@ public final class TtmlRenderUtilTest {
     style.setBackgroundColor(Color.YELLOW);
 
     TtmlStyle resolved = TtmlRenderUtil.resolveStyle(style, styleIds, globalStyles);
-    assertThat(resolved).isSameAs(style);
+    assertThat(resolved).isSameInstanceAs(style);
 
     // inline attribute not overridden
     assertThat(resolved.getBackgroundColor()).isEqualTo(YELLOW);
@@ -90,7 +90,7 @@ public final class TtmlRenderUtilTest {
     style.setBackgroundColor(Color.YELLOW);
 
     TtmlStyle resolved = TtmlRenderUtil.resolveStyle(style, styleIds, globalStyles);
-    assertThat(resolved).isSameAs(style);
+    assertThat(resolved).isSameInstanceAs(style);
 
     // inline attribute not overridden
     assertThat(resolved.getBackgroundColor()).isEqualTo(YELLOW);
@@ -101,7 +101,7 @@ public final class TtmlRenderUtilTest {
   @Test
   public void testResolveStyleOnlyInlineStyle() {
     TtmlStyle inlineStyle = new TtmlStyle();
-    assertThat(TtmlRenderUtil.resolveStyle(inlineStyle, null, null)).isSameAs(inlineStyle);
+    assertThat(TtmlRenderUtil.resolveStyle(inlineStyle, null, null)).isSameInstanceAs(inlineStyle);
   }
 
   private static Map<String, TtmlStyle> getGlobalStyles() {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
index 83fe34db97..e5dd4ae636 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -1491,7 +1491,7 @@ public final class DefaultTrackSelectorTest {
     assertThat(selection.length()).isEqualTo(1);
     assertThat(selection.getIndexInTrackGroup(0)).isEqualTo(expectedTrack);
     assertThat(selection.getFormat(0))
-        .isSameAs(expectedTrackGroup.getFormat(selection.getIndexInTrackGroup(0)));
+        .isSameInstanceAs(expectedTrackGroup.getFormat(selection.getIndexInTrackGroup(0)));
   }
 
   private static void assertNoSelection(TrackSelection selection) {
@@ -1506,7 +1506,7 @@ public final class DefaultTrackSelectorTest {
     for (int i = 0; i < expectedTracks.length; i++) {
       assertThat(selection.getIndexInTrackGroup(i)).isEqualTo(expectedTracks[i]);
       assertThat(selection.getFormat(i))
-          .isSameAs(expectedTrackGroup.getFormat(selection.getIndexInTrackGroup(i)));
+          .isSameInstanceAs(expectedTrackGroup.getFormat(selection.getIndexInTrackGroup(i)));
     }
   }
 
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
index 9acef96c0b..963e90f139 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
@@ -202,7 +202,7 @@ public class TrackSelectionUtilTest {
             MAX_DURATION_US,
             bitratesArrayToUse);
 
-    assertThat(bitrates).isSameAs(bitratesArrayToUse);
+    assertThat(bitrates).isSameInstanceAs(bitratesArrayToUse);
   }
 
   @Test
@@ -436,7 +436,7 @@ public class TrackSelectionUtilTest {
             MAX_DURATION_US,
             bitratesArrayToUse);
 
-    assertThat(bitrates).isSameAs(bitratesArrayToUse);
+    assertThat(bitrates).isSameInstanceAs(bitratesArrayToUse);
   }
 
   @Test
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
index 887338078e..d40149baae 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/WindowedTrackBitrateEstimatorTest.java
@@ -145,7 +145,7 @@ public class WindowedTrackBitrateEstimatorTest {
             new MediaChunkIterator[] {iterator1, iterator2},
             bitratesArrayToUse);
 
-    assertThat(bitrates).isSameAs(bitratesArrayToUse);
+    assertThat(bitrates).isSameInstanceAs(bitratesArrayToUse);
   }
 
   private static MediaChunk createMediaChunk(int formatBitrate, int actualBitrate) {
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
index 289de08c47..2426073d8a 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
@@ -40,10 +40,10 @@ public class BaseDataSourceTest {
     testSource.read(/* buffer= */ null, /* offset= */ 0, /* readLength= */ 100);
     testSource.close();
 
-    assertThat(transferListener.lastTransferInitializingSource).isSameAs(testSource);
-    assertThat(transferListener.lastTransferStartSource).isSameAs(testSource);
-    assertThat(transferListener.lastBytesTransferredSource).isSameAs(testSource);
-    assertThat(transferListener.lastTransferEndSource).isSameAs(testSource);
+    assertThat(transferListener.lastTransferInitializingSource).isSameInstanceAs(testSource);
+    assertThat(transferListener.lastTransferStartSource).isSameInstanceAs(testSource);
+    assertThat(transferListener.lastBytesTransferredSource).isSameInstanceAs(testSource);
+    assertThat(transferListener.lastTransferEndSource).isSameInstanceAs(testSource);
 
     assertThat(transferListener.lastTransferInitializingDataSpec).isEqualTo(dataSpec);
     assertThat(transferListener.lastTransferStartDataSpec).isEqualTo(dataSpec);
@@ -69,10 +69,10 @@ public class BaseDataSourceTest {
     testSource.read(/* buffer= */ null, /* offset= */ 0, /* readLength= */ 100);
     testSource.close();
 
-    assertThat(transferListener.lastTransferInitializingSource).isSameAs(testSource);
-    assertThat(transferListener.lastTransferStartSource).isSameAs(testSource);
-    assertThat(transferListener.lastBytesTransferredSource).isSameAs(testSource);
-    assertThat(transferListener.lastTransferEndSource).isSameAs(testSource);
+    assertThat(transferListener.lastTransferInitializingSource).isSameInstanceAs(testSource);
+    assertThat(transferListener.lastTransferStartSource).isSameInstanceAs(testSource);
+    assertThat(transferListener.lastBytesTransferredSource).isSameInstanceAs(testSource);
+    assertThat(transferListener.lastTransferEndSource).isSameInstanceAs(testSource);
 
     assertThat(transferListener.lastTransferInitializingDataSpec).isEqualTo(dataSpec);
     assertThat(transferListener.lastTransferStartDataSpec).isEqualTo(dataSpec);
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
index 80cc6b23cd..3fd67b294a 100644
--- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
+++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
@@ -362,7 +362,7 @@ public class HlsMediaPlaylistParserTest {
     List<Segment> segments = playlist.segments;
     assertThat(segments.get(0).initializationSegment).isNull();
     assertThat(segments.get(1).initializationSegment)
-        .isSameAs(segments.get(2).initializationSegment);
+        .isSameInstanceAs(segments.get(2).initializationSegment);
     assertThat(segments.get(1).initializationSegment.url).isEqualTo("init1.ts");
     assertThat(segments.get(3).initializationSegment.url).isEqualTo("init2.ts");
   }