diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
index f471370e4c..d6be100877 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
@@ -125,25 +125,25 @@ public final class CssParserTest extends InstrumentationTestCase {
     String stringInput = " lorem:ipsum\n{dolor}#sit,amet;lorem:ipsum\r\t\f\ndolor(())\n";
     ParsableByteArray input = new ParsableByteArray(Util.getUtf8Bytes(stringInput));
     StringBuilder builder = new StringBuilder();
-    assertEquals(CssParser.parseNextToken(input, builder), "lorem");
-    assertEquals(CssParser.parseNextToken(input, builder), ":");
-    assertEquals(CssParser.parseNextToken(input, builder), "ipsum");
-    assertEquals(CssParser.parseNextToken(input, builder), "{");
-    assertEquals(CssParser.parseNextToken(input, builder), "dolor");
-    assertEquals(CssParser.parseNextToken(input, builder), "}");
-    assertEquals(CssParser.parseNextToken(input, builder), "#sit");
-    assertEquals(CssParser.parseNextToken(input, builder), ",");
-    assertEquals(CssParser.parseNextToken(input, builder), "amet");
-    assertEquals(CssParser.parseNextToken(input, builder), ";");
-    assertEquals(CssParser.parseNextToken(input, builder), "lorem");
-    assertEquals(CssParser.parseNextToken(input, builder), ":");
-    assertEquals(CssParser.parseNextToken(input, builder), "ipsum");
-    assertEquals(CssParser.parseNextToken(input, builder), "dolor");
-    assertEquals(CssParser.parseNextToken(input, builder), "(");
-    assertEquals(CssParser.parseNextToken(input, builder), "(");
-    assertEquals(CssParser.parseNextToken(input, builder), ")");
-    assertEquals(CssParser.parseNextToken(input, builder), ")");
-    assertEquals(CssParser.parseNextToken(input, builder), null);
+    assertEquals("lorem", CssParser.parseNextToken(input, builder));
+    assertEquals(":", CssParser.parseNextToken(input, builder));
+    assertEquals("ipsum", CssParser.parseNextToken(input, builder));
+    assertEquals("{", CssParser.parseNextToken(input, builder));
+    assertEquals("dolor", CssParser.parseNextToken(input, builder));
+    assertEquals("}", CssParser.parseNextToken(input, builder));
+    assertEquals("#sit", CssParser.parseNextToken(input, builder));
+    assertEquals(",", CssParser.parseNextToken(input, builder));
+    assertEquals("amet", CssParser.parseNextToken(input, builder));
+    assertEquals(";", CssParser.parseNextToken(input, builder));
+    assertEquals("lorem", CssParser.parseNextToken(input, builder));
+    assertEquals(":", CssParser.parseNextToken(input, builder));
+    assertEquals("ipsum", CssParser.parseNextToken(input, builder));
+    assertEquals("dolor", CssParser.parseNextToken(input, builder));
+    assertEquals("(", CssParser.parseNextToken(input, builder));
+    assertEquals("(", CssParser.parseNextToken(input, builder));
+    assertEquals(")", CssParser.parseNextToken(input, builder));
+    assertEquals(")", CssParser.parseNextToken(input, builder));
+    assertEquals(null, CssParser.parseNextToken(input, builder));
   }
 
   public void testStyleScoreSystem() {
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index c76e4989d8..5c342ae3d3 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -160,25 +160,25 @@ public class CacheDataSourceTest extends InstrumentationTestCase {
 
   private void assertReadData(CacheDataSource cacheDataSource, boolean unknownLength, int position,
       int length) throws IOException {
-    int actualLength = TEST_DATA.length - position;
+    int testDataLength = TEST_DATA.length - position;
     if (length != C.LENGTH_UNSET) {
-      actualLength = Math.min(actualLength, length);
+      testDataLength = Math.min(testDataLength, length);
     }
-    assertEquals(unknownLength ? length : actualLength,
+    assertEquals(unknownLength ? length : testDataLength,
         cacheDataSource.open(new DataSpec(Uri.EMPTY, position, length, KEY_1)));
 
     byte[] buffer = new byte[100];
-    int index = 0;
+    int totalBytesRead = 0;
     while (true) {
-      int read = cacheDataSource.read(buffer, index, buffer.length - index);
+      int read = cacheDataSource.read(buffer, totalBytesRead, buffer.length - totalBytesRead);
       if (read == C.RESULT_END_OF_INPUT) {
         break;
       }
-      index += read;
+      totalBytesRead += read;
     }
-    assertEquals(actualLength, index);
-    MoreAsserts.assertEquals(Arrays.copyOfRange(TEST_DATA, position, position + actualLength),
-        Arrays.copyOf(buffer, index));
+    assertEquals(testDataLength, totalBytesRead);
+    MoreAsserts.assertEquals(Arrays.copyOfRange(TEST_DATA, position, position + testDataLength),
+        Arrays.copyOf(buffer, totalBytesRead));
 
     cacheDataSource.close();
   }