diff --git a/library/build.gradle b/library/build.gradle
index 1824106ffd..94dd66b7c7 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -40,6 +40,12 @@ android {
     lintOptions {
         abortOnError false
     }
+
+    sourceSets {
+        androidTest {
+            java.srcDirs += "../testutils/src/main/java/"
+        }
+    }
 }
 
 dependencies {
diff --git a/settings.gradle b/settings.gradle
index 79deda6170..15c9e057cb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 include ':library'
+include ':testutils'
 include ':demo'
 include ':extension-opus'
 include ':extension-vp9'
diff --git a/testutils/build.gradle b/testutils/build.gradle
new file mode 100644
index 0000000000..b9c851d51f
--- /dev/null
+++ b/testutils/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile project(':library')
+    compile 'org.mockito:mockito-core:1.9.5'
+}
diff --git a/testutils/src/main/AndroidManifest.xml b/testutils/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..ae5472ea8b
--- /dev/null
+++ b/testutils/src/main/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.exoplayer.testutils">
+
+  <!--
+    Important: ExoPlayerLib specifies a minSdkVersion of 9 because various components provided by
+    the library may be of use on older devices. However, please note that the core video playback
+    functionality provided by the library requires API level 16 or greater.
+  -->
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+
+</manifest>
diff --git a/library/src/androidTest/java/com/google/android/exoplayer/testutil/Dumper.java b/testutils/src/main/java/com/google/android/exoplayer/testutil/Dumper.java
similarity index 100%
rename from library/src/androidTest/java/com/google/android/exoplayer/testutil/Dumper.java
rename to testutils/src/main/java/com/google/android/exoplayer/testutil/Dumper.java
diff --git a/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeDataSource.java b/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeDataSource.java
similarity index 100%
rename from library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeDataSource.java
rename to testutils/src/main/java/com/google/android/exoplayer/testutil/FakeDataSource.java
diff --git a/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeExtractorInput.java b/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeExtractorInput.java
similarity index 99%
rename from library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeExtractorInput.java
rename to testutils/src/main/java/com/google/android/exoplayer/testutil/FakeExtractorInput.java
index 8b2c43746d..1640130d18 100644
--- a/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeExtractorInput.java
+++ b/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeExtractorInput.java
@@ -19,7 +19,6 @@ import com.google.android.exoplayer.C;
 import com.google.android.exoplayer.extractor.ExtractorInput;
 
 import android.util.SparseBooleanArray;
-
 import junit.framework.Assert;
 
 import java.io.EOFException;
diff --git a/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java b/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java
similarity index 100%
rename from library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java
rename to testutils/src/main/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java
diff --git a/library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java b/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java
similarity index 100%
rename from library/src/androidTest/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java
rename to testutils/src/main/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java
diff --git a/library/src/androidTest/java/com/google/android/exoplayer/testutil/TestUtil.java b/testutils/src/main/java/com/google/android/exoplayer/testutil/TestUtil.java
similarity index 100%
rename from library/src/androidTest/java/com/google/android/exoplayer/testutil/TestUtil.java
rename to testutils/src/main/java/com/google/android/exoplayer/testutil/TestUtil.java