diff --git a/src/test/java/com/google/devtools/build/android/r8/BUILD b/src/test/java/com/google/devtools/build/android/r8/BUILD
index df1a8791ecd0e3..a47c18cd570abf 100644
--- a/src/test/java/com/google/devtools/build/android/r8/BUILD
+++ b/src/test/java/com/google/devtools/build/android/r8/BUILD
@@ -22,6 +22,7 @@ java_library(
         "//external:has_androidsdk": glob(
             ["*Test.java"],
             exclude = [
+                "DexFileMergerTest.java",
                 "NoAndroidSdkStubTest.java",
                 "AllTests.java",
             ],
diff --git a/src/test/java/com/google/devtools/build/android/r8/DexFileMergerTest.java b/src/test/java/com/google/devtools/build/android/r8/DexFileMergerTest.java
index bd220bd02955a5..56c5fb6386f4a2 100644
--- a/src/test/java/com/google/devtools/build/android/r8/DexFileMergerTest.java
+++ b/src/test/java/com/google/devtools/build/android/r8/DexFileMergerTest.java
@@ -43,8 +43,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-// import com.android.tools.r8.maindexlist.MainDexListTests;
-
 /** Test for DexFileMerger. */
 @RunWith(JUnit4.class)
 public class DexFileMergerTest {