diff --git a/library/build.gradle b/library/build.gradle
index a6c2fa6414..dd741703ba 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -72,7 +72,7 @@ android.libraryVariants.all { variant ->
         classpath = files(variant.javaCompile.classpath.files, project.android.getBootClasspath())
         options {
             links "http://docs.oracle.com/javase/7/docs/api/"
-            linksOffline "https://d.android.com/reference","${android.sdkDirectory}/docs/reference"
+            linksOffline "https://developer.android.com/reference","${android.sdkDirectory}/docs/reference"
         }
         exclude '**/BuildConfig.java'
         exclude '**/R.java'
diff --git a/library/src/test/.project b/library/src/test/.project
index d63886b065..888dce8656 100644
--- a/library/src/test/.project
+++ b/library/src/test/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ExoPlayerTests</name>
+	<name>ExoPlayerLibTests</name>
 	<comment></comment>
 	<projects>
 		<project>ExoPlayerLib</project>
diff --git a/library/src/test/project.properties b/library/src/test/project.properties
index ef6eb035b6..0031332ec9 100644
--- a/library/src/test/project.properties
+++ b/library/src/test/project.properties
@@ -12,4 +12,5 @@
 
 # Project target.
 target=android-22
+android.library=false
 android.library.reference.1=../main