diff --git a/.gitmodules b/.gitmodules
index 525eef67ad..0698af97dc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,6 @@
 [submodule "library/src/androidTest/resources/exif-orientation-examples"]
 	path = library/src/androidTest/resources/exif-orientation-examples
 	url = https://github.com/recurser/exif-orientation-examples.git
-[submodule "library/src/test/resources/exif-orientation-examples"]
-	path = library/src/test/resources/exif-orientation-examples
+[submodule "library/test/src/test/resources/exif-orientation-examples"]
+	path = library/test/src/test/resources/exif-orientation-examples
 	url = https://github.com/recurser/exif-orientation-examples
diff --git a/build.gradle b/build.gradle
index 28fb6101f6..8987d59617 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,6 @@ if (JavaVersion.current().isJava8Compatible()) {
 
 subprojects { project ->
     tasks.withType(JavaCompile) {
-        options.fork = true
         sourceCompatibility = 1.7
         targetCompatibility = 1.7
 
diff --git a/checkstyle_suppressions.xml b/checkstyle_suppressions.xml
index f40e867cca..32352561bd 100644
--- a/checkstyle_suppressions.xml
+++ b/checkstyle_suppressions.xml
@@ -5,7 +5,7 @@
     "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 
 <suppressions>
-    <suppress files=".*[/\\]library[/\\]src[/\\]test[/\\].*" checks="Javadoc.*"/>
+    <suppress files=".*[/\\]library[/\\]test[/\\]src[/\\]test[/\\].*" checks="Javadoc.*"/>
     <suppress files=".*[/\\]annotation[/\\]compiler[/\\]test[/\\]src[/\\]test[/\\]resources[/\\].*" checks=".*"/>
     <suppress files=".*[/\\]instrumentation[/\\]src[/\\].*" checks="Javadoc.*"/>
     <suppress files=".*[/\\]instrumentation[/\\]src[/\\]androidTest[/\\].*" checks="Javadoc.*"/>
diff --git a/library/build.gradle b/library/build.gradle
index fdcc3720d3..a47b7173ba 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -4,39 +4,22 @@ if (!hasProperty('DISABLE_ERROR_PRONE')) {
     apply plugin: "net.ltgt.errorprone"
 }
 
+tasks.withType(JavaCompile) {
+    options.fork = true
+}
+
 dependencies {
     api project(':third_party:gif_decoder')
     api project(':third_party:disklrucache')
     api project(':annotation')
     api "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
     compileOnly "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
-    testImplementation project(':testutil')
-    testImplementation 'com.google.guava:guava-testlib:18.0'
-    testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
-    testImplementation "junit:junit:${JUNIT_VERSION}"
-    testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
-    testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
-    testImplementation "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}"
-    testImplementation "com.android.support:support-v4:${ANDROID_SUPPORT_VERSION}"
 
     if (project.plugins.hasPlugin('net.ltgt.errorprone')) {
         errorprone "com.google.errorprone:error_prone_core:${ERROR_PRONE_VERSION}"
     }
 }
 
-android.testOptions.unitTests.all { Test testTask ->
-    // configure max heap size of the test JVM
-    testTask.maxHeapSize = TEST_JVM_MEMORY_SIZE as String
-    if (JavaVersion.current() <= JavaVersion.VERSION_1_7) {
-        // Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=2048m; support was removed in 8.0
-        testTask.jvmArgs "-XX:MaxPermSize=${TEST_JVM_MEMORY_SIZE}"
-    }
-
-    // Initializing Robolectric is expensive, two threads seem to be around the only level where any
-    // improvement is seen.
-    testTask.maxParallelForks = 2
-}
-
 android {
     compileSdkVersion COMPILE_SDK_VERSION as int
 
@@ -44,13 +27,6 @@ android {
         minSdkVersion MIN_SDK_VERSION as int
         targetSdkVersion TARGET_SDK_VERSION as int
         versionName VERSION_NAME as String
-        consumerProguardFiles 'proguard-rules.txt'
-    }
-
-    buildTypes {
-        debug {
-            testCoverageEnabled = false
-        }
     }
 
     compileOptions {
@@ -61,6 +37,7 @@ android {
 
 check.dependsOn(':library:findbugs:findbugs')
 check.dependsOn(':library:pmd:pmd')
+check.dependsOn(':library:test:check')
 
 // Used in pmd and findbugs subprojects.
 @SuppressWarnings("GroovyUnusedDeclaration")
diff --git a/library/src/test/resources/exif-orientation-examples b/library/src/test/resources/exif-orientation-examples
deleted file mode 160000
index 85c6e142ee..0000000000
--- a/library/src/test/resources/exif-orientation-examples
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 85c6e142ee57d1c5c7a29b2efcd5980a584758e2
diff --git a/library/test/build.gradle b/library/test/build.gradle
new file mode 100644
index 0000000000..67c391819d
--- /dev/null
+++ b/library/test/build.gradle
@@ -0,0 +1,51 @@
+apply plugin: 'com.android.library'
+
+dependencies {
+    testImplementation "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
+    testImplementation project(':library')
+    testImplementation project(':testutil')
+    testImplementation 'com.google.guava:guava-testlib:18.0'
+    testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
+    testImplementation "junit:junit:${JUNIT_VERSION}"
+    testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
+    testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
+    testImplementation "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}"
+    testImplementation "com.android.support:support-v4:${ANDROID_SUPPORT_VERSION}"
+}
+
+tasks.withType(JavaCompile) {
+    options.fork = true
+}
+
+afterEvaluate {
+    lint.enabled = false
+    compileDebugJavaWithJavac.enabled = false
+}
+
+android.testOptions.unitTests.all { Test testTask ->
+    // configure max heap size of the test JVM
+    testTask.maxHeapSize = TEST_JVM_MEMORY_SIZE as String
+    if (JavaVersion.current() <= JavaVersion.VERSION_1_7) {
+        // Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=2048m; support was removed in 8.0
+        testTask.jvmArgs "-XX:MaxPermSize=${TEST_JVM_MEMORY_SIZE}"
+    }
+
+    // Initializing Robolectric is expensive, two threads seem to be around the only level where any
+    // improvement is seen.
+    testTask.maxParallelForks = 2
+}
+
+android {
+    compileSdkVersion COMPILE_SDK_VERSION as int
+
+    defaultConfig {
+        minSdkVersion MIN_SDK_VERSION as int
+        targetSdkVersion TARGET_SDK_VERSION as int
+        versionName VERSION_NAME as String
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+}
diff --git a/library/test/src/main/AndroidManifest.xml b/library/test/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..600ac91f9c
--- /dev/null
+++ b/library/test/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.bumptech.glide.test">
+    <application/>
+</manifest>
diff --git a/library/src/test/java/com/bumptech/glide/GlideContextTest.java b/library/test/src/test/java/glide/GlideContextTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/GlideContextTest.java
rename to library/test/src/test/java/glide/GlideContextTest.java
diff --git a/library/src/test/java/com/bumptech/glide/GlideTest.java b/library/test/src/test/java/glide/GlideTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/GlideTest.java
rename to library/test/src/test/java/glide/GlideTest.java
diff --git a/library/src/test/java/com/bumptech/glide/ListPreloaderTest.java b/library/test/src/test/java/glide/ListPreloaderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/ListPreloaderTest.java
rename to library/test/src/test/java/glide/ListPreloaderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/RequestBuilderTest.java b/library/test/src/test/java/glide/RequestBuilderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/RequestBuilderTest.java
rename to library/test/src/test/java/glide/RequestBuilderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/RequestManagerTest.java b/library/test/src/test/java/glide/RequestManagerTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/RequestManagerTest.java
rename to library/test/src/test/java/glide/RequestManagerTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/MultiTransformationTest.java b/library/test/src/test/java/glide/load/MultiTransformationTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/MultiTransformationTest.java
rename to library/test/src/test/java/glide/load/MultiTransformationTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/OptionsTest.java b/library/test/src/test/java/glide/load/OptionsTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/OptionsTest.java
rename to library/test/src/test/java/glide/load/OptionsTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/data/ExifOrientationStreamTest.java b/library/test/src/test/java/glide/load/data/ExifOrientationStreamTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/data/ExifOrientationStreamTest.java
rename to library/test/src/test/java/glide/load/data/ExifOrientationStreamTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/data/FileDescriptorAssetPathFetcherTest.java b/library/test/src/test/java/glide/load/data/FileDescriptorAssetPathFetcherTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/data/FileDescriptorAssetPathFetcherTest.java
rename to library/test/src/test/java/glide/load/data/FileDescriptorAssetPathFetcherTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/data/HttpUrlFetcherServerTest.java b/library/test/src/test/java/glide/load/data/HttpUrlFetcherServerTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/data/HttpUrlFetcherServerTest.java
rename to library/test/src/test/java/glide/load/data/HttpUrlFetcherServerTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/data/HttpUrlFetcherTest.java b/library/test/src/test/java/glide/load/data/HttpUrlFetcherTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/data/HttpUrlFetcherTest.java
rename to library/test/src/test/java/glide/load/data/HttpUrlFetcherTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/data/LocalUriFetcherTest.java b/library/test/src/test/java/glide/load/data/LocalUriFetcherTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/data/LocalUriFetcherTest.java
rename to library/test/src/test/java/glide/load/data/LocalUriFetcherTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/data/StreamAssetPathFetcherTest.java b/library/test/src/test/java/glide/load/data/StreamAssetPathFetcherTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/data/StreamAssetPathFetcherTest.java
rename to library/test/src/test/java/glide/load/data/StreamAssetPathFetcherTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/data/mediastore/ThumbFetcherTest.java b/library/test/src/test/java/glide/load/data/mediastore/ThumbFetcherTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/data/mediastore/ThumbFetcherTest.java
rename to library/test/src/test/java/glide/load/data/mediastore/ThumbFetcherTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/data/mediastore/ThumbnailStreamOpenerTest.java b/library/test/src/test/java/glide/load/data/mediastore/ThumbnailStreamOpenerTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/data/mediastore/ThumbnailStreamOpenerTest.java
rename to library/test/src/test/java/glide/load/data/mediastore/ThumbnailStreamOpenerTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/data/resource/FileDescriptorLocalUriFetcherTest.java b/library/test/src/test/java/glide/load/data/resource/FileDescriptorLocalUriFetcherTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/data/resource/FileDescriptorLocalUriFetcherTest.java
rename to library/test/src/test/java/glide/load/data/resource/FileDescriptorLocalUriFetcherTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/data/resource/StreamLocalUriFetcherTest.java b/library/test/src/test/java/glide/load/data/resource/StreamLocalUriFetcherTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/data/resource/StreamLocalUriFetcherTest.java
rename to library/test/src/test/java/glide/load/data/resource/StreamLocalUriFetcherTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/ActiveResourcesTest.java b/library/test/src/test/java/glide/load/engine/ActiveResourcesTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/ActiveResourcesTest.java
rename to library/test/src/test/java/glide/load/engine/ActiveResourcesTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/DataCacheKeyTest.java b/library/test/src/test/java/glide/load/engine/DataCacheKeyTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/DataCacheKeyTest.java
rename to library/test/src/test/java/glide/load/engine/DataCacheKeyTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/EngineJobTest.java b/library/test/src/test/java/glide/load/engine/EngineJobTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/EngineJobTest.java
rename to library/test/src/test/java/glide/load/engine/EngineJobTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/EngineKeyTest.java b/library/test/src/test/java/glide/load/engine/EngineKeyTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/EngineKeyTest.java
rename to library/test/src/test/java/glide/load/engine/EngineKeyTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/EngineResourceTest.java b/library/test/src/test/java/glide/load/engine/EngineResourceTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/EngineResourceTest.java
rename to library/test/src/test/java/glide/load/engine/EngineResourceTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/EngineTest.java b/library/test/src/test/java/glide/load/engine/EngineTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/EngineTest.java
rename to library/test/src/test/java/glide/load/engine/EngineTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/ResourceCacheKeyTest.java b/library/test/src/test/java/glide/load/engine/ResourceCacheKeyTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/ResourceCacheKeyTest.java
rename to library/test/src/test/java/glide/load/engine/ResourceCacheKeyTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/ResourceRecyclerTest.java b/library/test/src/test/java/glide/load/engine/ResourceRecyclerTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/ResourceRecyclerTest.java
rename to library/test/src/test/java/glide/load/engine/ResourceRecyclerTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/AttributeStrategyKeyTest.java b/library/test/src/test/java/glide/load/engine/bitmap_recycle/AttributeStrategyKeyTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/AttributeStrategyKeyTest.java
rename to library/test/src/test/java/glide/load/engine/bitmap_recycle/AttributeStrategyKeyTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/AttributeStrategyTest.java b/library/test/src/test/java/glide/load/engine/bitmap_recycle/AttributeStrategyTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/AttributeStrategyTest.java
rename to library/test/src/test/java/glide/load/engine/bitmap_recycle/AttributeStrategyTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/GroupedLinkedMapTest.java b/library/test/src/test/java/glide/load/engine/bitmap_recycle/GroupedLinkedMapTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/GroupedLinkedMapTest.java
rename to library/test/src/test/java/glide/load/engine/bitmap_recycle/GroupedLinkedMapTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/LruArrayPoolTest.java b/library/test/src/test/java/glide/load/engine/bitmap_recycle/LruArrayPoolTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/LruArrayPoolTest.java
rename to library/test/src/test/java/glide/load/engine/bitmap_recycle/LruArrayPoolTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/LruBitmapPoolTest.java b/library/test/src/test/java/glide/load/engine/bitmap_recycle/LruBitmapPoolTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/LruBitmapPoolTest.java
rename to library/test/src/test/java/glide/load/engine/bitmap_recycle/LruBitmapPoolTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/SizeConfigStrategyTest.java b/library/test/src/test/java/glide/load/engine/bitmap_recycle/SizeConfigStrategyTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/SizeConfigStrategyTest.java
rename to library/test/src/test/java/glide/load/engine/bitmap_recycle/SizeConfigStrategyTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/SizeStrategyKeyTest.java b/library/test/src/test/java/glide/load/engine/bitmap_recycle/SizeStrategyKeyTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/bitmap_recycle/SizeStrategyKeyTest.java
rename to library/test/src/test/java/glide/load/engine/bitmap_recycle/SizeStrategyKeyTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/cache/DiskLruCacheWrapperTest.java b/library/test/src/test/java/glide/load/engine/cache/DiskLruCacheWrapperTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/cache/DiskLruCacheWrapperTest.java
rename to library/test/src/test/java/glide/load/engine/cache/DiskLruCacheWrapperTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/cache/LruCacheTest.java b/library/test/src/test/java/glide/load/engine/cache/LruCacheTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/cache/LruCacheTest.java
rename to library/test/src/test/java/glide/load/engine/cache/LruCacheTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/cache/LruResourceCacheTest.java b/library/test/src/test/java/glide/load/engine/cache/LruResourceCacheTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/cache/LruResourceCacheTest.java
rename to library/test/src/test/java/glide/load/engine/cache/LruResourceCacheTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/cache/MemorySizeCalculatorTest.java b/library/test/src/test/java/glide/load/engine/cache/MemorySizeCalculatorTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/cache/MemorySizeCalculatorTest.java
rename to library/test/src/test/java/glide/load/engine/cache/MemorySizeCalculatorTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/cache/SafeKeyGeneratorTest.java b/library/test/src/test/java/glide/load/engine/cache/SafeKeyGeneratorTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/cache/SafeKeyGeneratorTest.java
rename to library/test/src/test/java/glide/load/engine/cache/SafeKeyGeneratorTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/executor/GlideExecutorTest.java b/library/test/src/test/java/glide/load/engine/executor/GlideExecutorTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/executor/GlideExecutorTest.java
rename to library/test/src/test/java/glide/load/engine/executor/GlideExecutorTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/executor/MockGlideExecutor.java b/library/test/src/test/java/glide/load/engine/executor/MockGlideExecutor.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/executor/MockGlideExecutor.java
rename to library/test/src/test/java/glide/load/engine/executor/MockGlideExecutor.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/prefill/BitmapPreFillRunnerTest.java b/library/test/src/test/java/glide/load/engine/prefill/BitmapPreFillRunnerTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/prefill/BitmapPreFillRunnerTest.java
rename to library/test/src/test/java/glide/load/engine/prefill/BitmapPreFillRunnerTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/prefill/BitmapPreFillerTest.java b/library/test/src/test/java/glide/load/engine/prefill/BitmapPreFillerTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/prefill/BitmapPreFillerTest.java
rename to library/test/src/test/java/glide/load/engine/prefill/BitmapPreFillerTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/engine/prefill/PreFillTypeTest.java b/library/test/src/test/java/glide/load/engine/prefill/PreFillTypeTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/engine/prefill/PreFillTypeTest.java
rename to library/test/src/test/java/glide/load/engine/prefill/PreFillTypeTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/AssetUriLoaderTest.java b/library/test/src/test/java/glide/load/model/AssetUriLoaderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/AssetUriLoaderTest.java
rename to library/test/src/test/java/glide/load/model/AssetUriLoaderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/ByteArrayLoaderTest.java b/library/test/src/test/java/glide/load/model/ByteArrayLoaderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/ByteArrayLoaderTest.java
rename to library/test/src/test/java/glide/load/model/ByteArrayLoaderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/DataUrlLoaderTest.java b/library/test/src/test/java/glide/load/model/DataUrlLoaderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/DataUrlLoaderTest.java
rename to library/test/src/test/java/glide/load/model/DataUrlLoaderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/GlideUrlTest.java b/library/test/src/test/java/glide/load/model/GlideUrlTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/GlideUrlTest.java
rename to library/test/src/test/java/glide/load/model/GlideUrlTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/LazyHeadersTest.java b/library/test/src/test/java/glide/load/model/LazyHeadersTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/LazyHeadersTest.java
rename to library/test/src/test/java/glide/load/model/LazyHeadersTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/ModelCacheTest.java b/library/test/src/test/java/glide/load/model/ModelCacheTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/ModelCacheTest.java
rename to library/test/src/test/java/glide/load/model/ModelCacheTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/MultiModelLoaderFactoryTest.java b/library/test/src/test/java/glide/load/model/MultiModelLoaderFactoryTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/MultiModelLoaderFactoryTest.java
rename to library/test/src/test/java/glide/load/model/MultiModelLoaderFactoryTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/ResourceLoaderTest.java b/library/test/src/test/java/glide/load/model/ResourceLoaderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/ResourceLoaderTest.java
rename to library/test/src/test/java/glide/load/model/ResourceLoaderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/StreamEncoderTest.java b/library/test/src/test/java/glide/load/model/StreamEncoderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/StreamEncoderTest.java
rename to library/test/src/test/java/glide/load/model/StreamEncoderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/StringLoaderTest.java b/library/test/src/test/java/glide/load/model/StringLoaderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/StringLoaderTest.java
rename to library/test/src/test/java/glide/load/model/StringLoaderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/UriLoaderTest.java b/library/test/src/test/java/glide/load/model/UriLoaderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/UriLoaderTest.java
rename to library/test/src/test/java/glide/load/model/UriLoaderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/stream/BaseGlideUrlLoaderTest.java b/library/test/src/test/java/glide/load/model/stream/BaseGlideUrlLoaderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/stream/BaseGlideUrlLoaderTest.java
rename to library/test/src/test/java/glide/load/model/stream/BaseGlideUrlLoaderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/stream/HttpGlideUrlLoaderTest.java b/library/test/src/test/java/glide/load/model/stream/HttpGlideUrlLoaderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/stream/HttpGlideUrlLoaderTest.java
rename to library/test/src/test/java/glide/load/model/stream/HttpGlideUrlLoaderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/model/stream/HttpUriLoaderTest.java b/library/test/src/test/java/glide/load/model/stream/HttpUriLoaderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/model/stream/HttpUriLoaderTest.java
rename to library/test/src/test/java/glide/load/model/stream/HttpUriLoaderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/SimpleResourceTest.java b/library/test/src/test/java/glide/load/resource/SimpleResourceTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/SimpleResourceTest.java
rename to library/test/src/test/java/glide/load/resource/SimpleResourceTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/UnitTransformationTest.java b/library/test/src/test/java/glide/load/resource/UnitTransformationTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/UnitTransformationTest.java
rename to library/test/src/test/java/glide/load/resource/UnitTransformationTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableResourceTest.java b/library/test/src/test/java/glide/load/resource/bitmap/BitmapDrawableResourceTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableResourceTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/BitmapDrawableResourceTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableTransformationTest.java b/library/test/src/test/java/glide/load/resource/bitmap/BitmapDrawableTransformationTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableTransformationTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/BitmapDrawableTransformationTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoderTest.java b/library/test/src/test/java/glide/load/resource/bitmap/BitmapEncoderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoderTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/BitmapEncoderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapResourceTest.java b/library/test/src/test/java/glide/load/resource/bitmap/BitmapResourceTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapResourceTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/BitmapResourceTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapTransformationTest.java b/library/test/src/test/java/glide/load/resource/bitmap/BitmapTransformationTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapTransformationTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/BitmapTransformationTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterCropTest.java b/library/test/src/test/java/glide/load/resource/bitmap/CenterCropTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterCropTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/CenterCropTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterInsideTest.java b/library/test/src/test/java/glide/load/resource/bitmap/CenterInsideTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterInsideTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/CenterInsideTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/CircleCropTest.java b/library/test/src/test/java/glide/load/resource/bitmap/CircleCropTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/CircleCropTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/CircleCropTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/DefaultImageHeaderParserTest.java b/library/test/src/test/java/glide/load/resource/bitmap/DefaultImageHeaderParserTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/DefaultImageHeaderParserTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/DefaultImageHeaderParserTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/DownsampleStrategyTest.java b/library/test/src/test/java/glide/load/resource/bitmap/DownsampleStrategyTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/DownsampleStrategyTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/DownsampleStrategyTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/DrawableTransformationTest.java b/library/test/src/test/java/glide/load/resource/bitmap/DrawableTransformationTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/DrawableTransformationTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/DrawableTransformationTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/FitCenterTest.java b/library/test/src/test/java/glide/load/resource/bitmap/FitCenterTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/FitCenterTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/FitCenterTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/LazyBitmapDrawableResourceTest.java b/library/test/src/test/java/glide/load/resource/bitmap/LazyBitmapDrawableResourceTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/LazyBitmapDrawableResourceTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/LazyBitmapDrawableResourceTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/RecyclableBufferedInputStreamTest.java b/library/test/src/test/java/glide/load/resource/bitmap/RecyclableBufferedInputStreamTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/RecyclableBufferedInputStreamTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/RecyclableBufferedInputStreamTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/TransformationUtilsTest.java b/library/test/src/test/java/glide/load/resource/bitmap/TransformationUtilsTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/TransformationUtilsTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/TransformationUtilsTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bitmap/VideoDecoderTest.java b/library/test/src/test/java/glide/load/resource/bitmap/VideoDecoderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bitmap/VideoDecoderTest.java
rename to library/test/src/test/java/glide/load/resource/bitmap/VideoDecoderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/bytes/BytesResourceTest.java b/library/test/src/test/java/glide/load/resource/bytes/BytesResourceTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/bytes/BytesResourceTest.java
rename to library/test/src/test/java/glide/load/resource/bytes/BytesResourceTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/drawable/DrawableResourceTest.java b/library/test/src/test/java/glide/load/resource/drawable/DrawableResourceTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/drawable/DrawableResourceTest.java
rename to library/test/src/test/java/glide/load/resource/drawable/DrawableResourceTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/file/FileDecoderTest.java b/library/test/src/test/java/glide/load/resource/file/FileDecoderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/file/FileDecoderTest.java
rename to library/test/src/test/java/glide/load/resource/file/FileDecoderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/file/FileResourceTest.java b/library/test/src/test/java/glide/load/resource/file/FileResourceTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/file/FileResourceTest.java
rename to library/test/src/test/java/glide/load/resource/file/FileResourceTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/ByteBufferGifDecoderTest.java b/library/test/src/test/java/glide/load/resource/gif/ByteBufferGifDecoderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/gif/ByteBufferGifDecoderTest.java
rename to library/test/src/test/java/glide/load/resource/gif/ByteBufferGifDecoderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java b/library/test/src/test/java/glide/load/resource/gif/GifDrawableResourceTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java
rename to library/test/src/test/java/glide/load/resource/gif/GifDrawableResourceTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableTest.java b/library/test/src/test/java/glide/load/resource/gif/GifDrawableTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableTest.java
rename to library/test/src/test/java/glide/load/resource/gif/GifDrawableTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableTransformationTest.java b/library/test/src/test/java/glide/load/resource/gif/GifDrawableTransformationTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableTransformationTest.java
rename to library/test/src/test/java/glide/load/resource/gif/GifDrawableTransformationTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifFrameLoaderTest.java b/library/test/src/test/java/glide/load/resource/gif/GifFrameLoaderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/gif/GifFrameLoaderTest.java
rename to library/test/src/test/java/glide/load/resource/gif/GifFrameLoaderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/GifFrameResourceDecoderTest.java b/library/test/src/test/java/glide/load/resource/gif/GifFrameResourceDecoderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/gif/GifFrameResourceDecoderTest.java
rename to library/test/src/test/java/glide/load/resource/gif/GifFrameResourceDecoderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/gif/StreamGifDecoderTest.java b/library/test/src/test/java/glide/load/resource/gif/StreamGifDecoderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/gif/StreamGifDecoderTest.java
rename to library/test/src/test/java/glide/load/resource/gif/StreamGifDecoderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoderTest.java b/library/test/src/test/java/glide/load/resource/transcode/BitmapBytesTranscoderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoderTest.java
rename to library/test/src/test/java/glide/load/resource/transcode/BitmapBytesTranscoderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java b/library/test/src/test/java/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java
rename to library/test/src/test/java/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDrawableBytesTranscoderTest.java b/library/test/src/test/java/glide/load/resource/transcode/GifDrawableBytesTranscoderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDrawableBytesTranscoderTest.java
rename to library/test/src/test/java/glide/load/resource/transcode/GifDrawableBytesTranscoderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/TranscoderRegistryTest.java b/library/test/src/test/java/glide/load/resource/transcode/TranscoderRegistryTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/transcode/TranscoderRegistryTest.java
rename to library/test/src/test/java/glide/load/resource/transcode/TranscoderRegistryTest.java
diff --git a/library/src/test/java/com/bumptech/glide/load/resource/transcode/UnitTranscoderTest.java b/library/test/src/test/java/glide/load/resource/transcode/UnitTranscoderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/load/resource/transcode/UnitTranscoderTest.java
rename to library/test/src/test/java/glide/load/resource/transcode/UnitTranscoderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorFactoryTest.java b/library/test/src/test/java/glide/manager/DefaultConnectivityMonitorFactoryTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorFactoryTest.java
rename to library/test/src/test/java/glide/manager/DefaultConnectivityMonitorFactoryTest.java
diff --git a/library/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorTest.java b/library/test/src/test/java/glide/manager/DefaultConnectivityMonitorTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/manager/DefaultConnectivityMonitorTest.java
rename to library/test/src/test/java/glide/manager/DefaultConnectivityMonitorTest.java
diff --git a/library/src/test/java/com/bumptech/glide/manager/Issue117Activity.java b/library/test/src/test/java/glide/manager/Issue117Activity.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/manager/Issue117Activity.java
rename to library/test/src/test/java/glide/manager/Issue117Activity.java
diff --git a/library/src/test/java/com/bumptech/glide/manager/LifecycleTest.java b/library/test/src/test/java/glide/manager/LifecycleTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/manager/LifecycleTest.java
rename to library/test/src/test/java/glide/manager/LifecycleTest.java
diff --git a/library/src/test/java/com/bumptech/glide/manager/RequestManagerFragmentTest.java b/library/test/src/test/java/glide/manager/RequestManagerFragmentTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/manager/RequestManagerFragmentTest.java
rename to library/test/src/test/java/glide/manager/RequestManagerFragmentTest.java
diff --git a/library/src/test/java/com/bumptech/glide/manager/RequestManagerRetrieverTest.java b/library/test/src/test/java/glide/manager/RequestManagerRetrieverTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/manager/RequestManagerRetrieverTest.java
rename to library/test/src/test/java/glide/manager/RequestManagerRetrieverTest.java
diff --git a/library/src/test/java/com/bumptech/glide/manager/RequestTrackerTest.java b/library/test/src/test/java/glide/manager/RequestTrackerTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/manager/RequestTrackerTest.java
rename to library/test/src/test/java/glide/manager/RequestTrackerTest.java
diff --git a/library/src/test/java/com/bumptech/glide/module/ManifestParserTest.java b/library/test/src/test/java/glide/module/ManifestParserTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/module/ManifestParserTest.java
rename to library/test/src/test/java/glide/module/ManifestParserTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/ErrorRequestCoordinatorTest.java b/library/test/src/test/java/glide/request/ErrorRequestCoordinatorTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/ErrorRequestCoordinatorTest.java
rename to library/test/src/test/java/glide/request/ErrorRequestCoordinatorTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/RequestFutureTargetTest.java b/library/test/src/test/java/glide/request/RequestFutureTargetTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/RequestFutureTargetTest.java
rename to library/test/src/test/java/glide/request/RequestFutureTargetTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/RequestOptionsTest.java b/library/test/src/test/java/glide/request/RequestOptionsTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/RequestOptionsTest.java
rename to library/test/src/test/java/glide/request/RequestOptionsTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/SingleRequestTest.java b/library/test/src/test/java/glide/request/SingleRequestTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/SingleRequestTest.java
rename to library/test/src/test/java/glide/request/SingleRequestTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/ThumbnailRequestCoordinatorTest.java b/library/test/src/test/java/glide/request/ThumbnailRequestCoordinatorTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/ThumbnailRequestCoordinatorTest.java
rename to library/test/src/test/java/glide/request/ThumbnailRequestCoordinatorTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/target/AppWidgetTargetTest.java b/library/test/src/test/java/glide/request/target/AppWidgetTargetTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/target/AppWidgetTargetTest.java
rename to library/test/src/test/java/glide/request/target/AppWidgetTargetTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/target/BitmapImageViewTargetTest.java b/library/test/src/test/java/glide/request/target/BitmapImageViewTargetTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/target/BitmapImageViewTargetTest.java
rename to library/test/src/test/java/glide/request/target/BitmapImageViewTargetTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/target/ImageViewTargetFactoryTest.java b/library/test/src/test/java/glide/request/target/ImageViewTargetFactoryTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/target/ImageViewTargetFactoryTest.java
rename to library/test/src/test/java/glide/request/target/ImageViewTargetFactoryTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/target/ImageViewTargetTest.java b/library/test/src/test/java/glide/request/target/ImageViewTargetTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/target/ImageViewTargetTest.java
rename to library/test/src/test/java/glide/request/target/ImageViewTargetTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/target/NotificationTargetTest.java b/library/test/src/test/java/glide/request/target/NotificationTargetTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/target/NotificationTargetTest.java
rename to library/test/src/test/java/glide/request/target/NotificationTargetTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/target/PreloadTargetTest.java b/library/test/src/test/java/glide/request/target/PreloadTargetTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/target/PreloadTargetTest.java
rename to library/test/src/test/java/glide/request/target/PreloadTargetTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/target/SimpleTargetTest.java b/library/test/src/test/java/glide/request/target/SimpleTargetTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/target/SimpleTargetTest.java
rename to library/test/src/test/java/glide/request/target/SimpleTargetTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/target/ViewTargetTest.java b/library/test/src/test/java/glide/request/target/ViewTargetTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/target/ViewTargetTest.java
rename to library/test/src/test/java/glide/request/target/ViewTargetTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/transition/DrawableCrossFadeFactoryTest.java b/library/test/src/test/java/glide/request/transition/DrawableCrossFadeFactoryTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/transition/DrawableCrossFadeFactoryTest.java
rename to library/test/src/test/java/glide/request/transition/DrawableCrossFadeFactoryTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/transition/DrawableCrossFadeViewAnimationTest.java b/library/test/src/test/java/glide/request/transition/DrawableCrossFadeViewAnimationTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/transition/DrawableCrossFadeViewAnimationTest.java
rename to library/test/src/test/java/glide/request/transition/DrawableCrossFadeViewAnimationTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/transition/ViewAnimationTest.java b/library/test/src/test/java/glide/request/transition/ViewAnimationTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/transition/ViewAnimationTest.java
rename to library/test/src/test/java/glide/request/transition/ViewAnimationTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/transition/ViewPropertyAnimationTest.java b/library/test/src/test/java/glide/request/transition/ViewPropertyAnimationTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/transition/ViewPropertyAnimationTest.java
rename to library/test/src/test/java/glide/request/transition/ViewPropertyAnimationTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/transition/ViewPropertyViewTransitionAnimationFactoryTest.java b/library/test/src/test/java/glide/request/transition/ViewPropertyViewTransitionAnimationFactoryTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/transition/ViewPropertyViewTransitionAnimationFactoryTest.java
rename to library/test/src/test/java/glide/request/transition/ViewPropertyViewTransitionAnimationFactoryTest.java
diff --git a/library/src/test/java/com/bumptech/glide/request/transition/ViewTransitionAnimationFactoryTest.java b/library/test/src/test/java/glide/request/transition/ViewTransitionAnimationFactoryTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/request/transition/ViewTransitionAnimationFactoryTest.java
rename to library/test/src/test/java/glide/request/transition/ViewTransitionAnimationFactoryTest.java
diff --git a/library/src/test/java/com/bumptech/glide/resize/load/ExifTest.java b/library/test/src/test/java/glide/resize/load/ExifTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/resize/load/ExifTest.java
rename to library/test/src/test/java/glide/resize/load/ExifTest.java
diff --git a/library/src/test/java/com/bumptech/glide/signature/ApplicationVersionSignatureTest.java b/library/test/src/test/java/glide/signature/ApplicationVersionSignatureTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/signature/ApplicationVersionSignatureTest.java
rename to library/test/src/test/java/glide/signature/ApplicationVersionSignatureTest.java
diff --git a/library/src/test/java/com/bumptech/glide/signature/EmptySignatureTest.java b/library/test/src/test/java/glide/signature/EmptySignatureTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/signature/EmptySignatureTest.java
rename to library/test/src/test/java/glide/signature/EmptySignatureTest.java
diff --git a/library/src/test/java/com/bumptech/glide/signature/MediaStoreSignatureTest.java b/library/test/src/test/java/glide/signature/MediaStoreSignatureTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/signature/MediaStoreSignatureTest.java
rename to library/test/src/test/java/glide/signature/MediaStoreSignatureTest.java
diff --git a/library/src/test/java/com/bumptech/glide/signature/ObjectKeyTest.java b/library/test/src/test/java/glide/signature/ObjectKeyTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/signature/ObjectKeyTest.java
rename to library/test/src/test/java/glide/signature/ObjectKeyTest.java
diff --git a/library/src/test/java/com/bumptech/glide/tests/BackgroundUtil.java b/library/test/src/test/java/glide/tests/BackgroundUtil.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/tests/BackgroundUtil.java
rename to library/test/src/test/java/glide/tests/BackgroundUtil.java
diff --git a/library/src/test/java/com/bumptech/glide/tests/ContentResolverShadow.java b/library/test/src/test/java/glide/tests/ContentResolverShadow.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/tests/ContentResolverShadow.java
rename to library/test/src/test/java/glide/tests/ContentResolverShadow.java
diff --git a/library/src/test/java/com/bumptech/glide/tests/GlideShadowLog.java b/library/test/src/test/java/glide/tests/GlideShadowLog.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/tests/GlideShadowLog.java
rename to library/test/src/test/java/glide/tests/GlideShadowLog.java
diff --git a/library/src/test/java/com/bumptech/glide/tests/GlideShadowLooper.java b/library/test/src/test/java/glide/tests/GlideShadowLooper.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/tests/GlideShadowLooper.java
rename to library/test/src/test/java/glide/tests/GlideShadowLooper.java
diff --git a/library/src/test/java/com/bumptech/glide/tests/KeyTester.java b/library/test/src/test/java/glide/tests/KeyTester.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/tests/KeyTester.java
rename to library/test/src/test/java/glide/tests/KeyTester.java
diff --git a/library/src/test/java/com/bumptech/glide/tests/TearDownGlide.java b/library/test/src/test/java/glide/tests/TearDownGlide.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/tests/TearDownGlide.java
rename to library/test/src/test/java/glide/tests/TearDownGlide.java
diff --git a/library/src/test/java/com/bumptech/glide/tests/Util.java b/library/test/src/test/java/glide/tests/Util.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/tests/Util.java
rename to library/test/src/test/java/glide/tests/Util.java
diff --git a/library/src/test/java/com/bumptech/glide/util/ByteBufferUtilTest.java b/library/test/src/test/java/glide/util/ByteBufferUtilTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/util/ByteBufferUtilTest.java
rename to library/test/src/test/java/glide/util/ByteBufferUtilTest.java
diff --git a/library/src/test/java/com/bumptech/glide/util/ContentLengthInputStreamTest.java b/library/test/src/test/java/glide/util/ContentLengthInputStreamTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/util/ContentLengthInputStreamTest.java
rename to library/test/src/test/java/glide/util/ContentLengthInputStreamTest.java
diff --git a/library/src/test/java/com/bumptech/glide/util/ExceptionCatchingInputStreamTest.java b/library/test/src/test/java/glide/util/ExceptionCatchingInputStreamTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/util/ExceptionCatchingInputStreamTest.java
rename to library/test/src/test/java/glide/util/ExceptionCatchingInputStreamTest.java
diff --git a/library/src/test/java/com/bumptech/glide/util/FixedPreloadSizeProviderTest.java b/library/test/src/test/java/glide/util/FixedPreloadSizeProviderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/util/FixedPreloadSizeProviderTest.java
rename to library/test/src/test/java/glide/util/FixedPreloadSizeProviderTest.java
diff --git a/library/src/test/java/com/bumptech/glide/util/MarkEnforcingInputStreamTest.java b/library/test/src/test/java/glide/util/MarkEnforcingInputStreamTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/util/MarkEnforcingInputStreamTest.java
rename to library/test/src/test/java/glide/util/MarkEnforcingInputStreamTest.java
diff --git a/library/src/test/java/com/bumptech/glide/util/UtilTest.java b/library/test/src/test/java/glide/util/UtilTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/util/UtilTest.java
rename to library/test/src/test/java/glide/util/UtilTest.java
diff --git a/library/src/test/java/com/bumptech/glide/util/ViewPreloadSizeProviderTest.java b/library/test/src/test/java/glide/util/ViewPreloadSizeProviderTest.java
similarity index 100%
rename from library/src/test/java/com/bumptech/glide/util/ViewPreloadSizeProviderTest.java
rename to library/test/src/test/java/glide/util/ViewPreloadSizeProviderTest.java
diff --git a/library/src/test/java/javax/microedition/khronos/opengles/GL.java b/library/test/src/test/java/opengles/GL.java
similarity index 100%
rename from library/src/test/java/javax/microedition/khronos/opengles/GL.java
rename to library/test/src/test/java/opengles/GL.java
diff --git a/library/test/src/test/resources/exif-orientation-examples/LICENSE b/library/test/src/test/resources/exif-orientation-examples/LICENSE
new file mode 100644
index 0000000000..978ee2ae82
--- /dev/null
+++ b/library/test/src/test/resources/exif-orientation-examples/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2010 Dave Perrett, http://recursive-design.com/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/library/test/src/test/resources/exif-orientation-examples/Landscape_1.jpg b/library/test/src/test/resources/exif-orientation-examples/Landscape_1.jpg
new file mode 100644
index 0000000000..015c5f177b
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Landscape_1.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Landscape_2.jpg b/library/test/src/test/resources/exif-orientation-examples/Landscape_2.jpg
new file mode 100644
index 0000000000..2e7fb579ad
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Landscape_2.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Landscape_3.jpg b/library/test/src/test/resources/exif-orientation-examples/Landscape_3.jpg
new file mode 100644
index 0000000000..74505cfc1d
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Landscape_3.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Landscape_4.jpg b/library/test/src/test/resources/exif-orientation-examples/Landscape_4.jpg
new file mode 100644
index 0000000000..ea133fbb03
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Landscape_4.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Landscape_5.jpg b/library/test/src/test/resources/exif-orientation-examples/Landscape_5.jpg
new file mode 100644
index 0000000000..81a8af69bb
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Landscape_5.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Landscape_6.jpg b/library/test/src/test/resources/exif-orientation-examples/Landscape_6.jpg
new file mode 100644
index 0000000000..7426aba04e
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Landscape_6.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Landscape_7.jpg b/library/test/src/test/resources/exif-orientation-examples/Landscape_7.jpg
new file mode 100644
index 0000000000..a541d95e78
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Landscape_7.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Landscape_8.jpg b/library/test/src/test/resources/exif-orientation-examples/Landscape_8.jpg
new file mode 100644
index 0000000000..3f51d28736
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Landscape_8.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Portrait_1.jpg b/library/test/src/test/resources/exif-orientation-examples/Portrait_1.jpg
new file mode 100644
index 0000000000..f5797797e3
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Portrait_1.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Portrait_2.jpg b/library/test/src/test/resources/exif-orientation-examples/Portrait_2.jpg
new file mode 100644
index 0000000000..4d9212c209
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Portrait_2.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Portrait_3.jpg b/library/test/src/test/resources/exif-orientation-examples/Portrait_3.jpg
new file mode 100644
index 0000000000..2f88b6d222
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Portrait_3.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Portrait_4.jpg b/library/test/src/test/resources/exif-orientation-examples/Portrait_4.jpg
new file mode 100644
index 0000000000..cc947dadb1
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Portrait_4.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Portrait_5.jpg b/library/test/src/test/resources/exif-orientation-examples/Portrait_5.jpg
new file mode 100644
index 0000000000..b14114bcf1
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Portrait_5.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Portrait_6.jpg b/library/test/src/test/resources/exif-orientation-examples/Portrait_6.jpg
new file mode 100644
index 0000000000..79617a97c9
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Portrait_6.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Portrait_7.jpg b/library/test/src/test/resources/exif-orientation-examples/Portrait_7.jpg
new file mode 100644
index 0000000000..fbcde86dac
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Portrait_7.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/Portrait_8.jpg b/library/test/src/test/resources/exif-orientation-examples/Portrait_8.jpg
new file mode 100644
index 0000000000..07beac8d44
Binary files /dev/null and b/library/test/src/test/resources/exif-orientation-examples/Portrait_8.jpg differ
diff --git a/library/test/src/test/resources/exif-orientation-examples/README.markdown b/library/test/src/test/resources/exif-orientation-examples/README.markdown
new file mode 100644
index 0000000000..2bfd667766
--- /dev/null
+++ b/library/test/src/test/resources/exif-orientation-examples/README.markdown
@@ -0,0 +1,36 @@
+EXIF Orientation-flag example images
+====================================
+
+Example images using each of the EXIF orientation flags (1-to-8), in both landscape and portrait orientations.
+
+[See here](http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/) for more information.
+
+Change history
+-----------
+
+* **Version 1.0.1 (2013-03-10)** : Add MIT license and some contact details.
+* **Version 1.0.0 (2012-07-28)** : 1.0 release.
+
+Contributing
+------------
+
+Once you've made your commits:
+
+1. [Fork](http://help.github.com/fork-a-repo/) exif-orientation-examples
+2. Create a topic branch - `git checkout -b my_branch`
+3. Push to your branch - `git push origin my_branch`
+4. Create a [Pull Request](http://help.github.com/pull-requests/) from your branch
+5. That's it!
+
+Author
+------
+
+Dave Perrett :: hello@daveperrett.com :: [@daveperrett](http://twitter.com/daveperrett)
+
+
+Copyright
+---------
+
+These images are licensed under the [MIT License](http://opensource.org/licenses/MIT).
+
+Copyright (c) 2010 Dave Perrett. See [License](https://github.com/recurser/exif-orientation-examples/blob/master/LICENSE) for details.
\ No newline at end of file
diff --git a/library/test/src/test/resources/exif-orientation-examples/VERSION b/library/test/src/test/resources/exif-orientation-examples/VERSION
new file mode 100644
index 0000000000..7f207341d5
--- /dev/null
+++ b/library/test/src/test/resources/exif-orientation-examples/VERSION
@@ -0,0 +1 @@
+1.0.1
\ No newline at end of file
diff --git a/library/src/test/resources/issue387_rotated_jpeg.jpg b/library/test/src/test/resources/issue387_rotated_jpeg.jpg
similarity index 100%
rename from library/src/test/resources/issue387_rotated_jpeg.jpg
rename to library/test/src/test/resources/issue387_rotated_jpeg.jpg
diff --git a/library/src/test/resources/org.robolectric.Config.properties b/library/test/src/test/resources/org.robolectric.Config.properties
similarity index 100%
rename from library/src/test/resources/org.robolectric.Config.properties
rename to library/test/src/test/resources/org.robolectric.Config.properties
diff --git a/library/src/test/resources/short_exif_sample.jpg b/library/test/src/test/resources/short_exif_sample.jpg
similarity index 100%
rename from library/src/test/resources/short_exif_sample.jpg
rename to library/test/src/test/resources/short_exif_sample.jpg
diff --git a/library/src/test/resources/test.gif b/library/test/src/test/resources/test.gif
similarity index 100%
rename from library/src/test/resources/test.gif
rename to library/test/src/test/resources/test.gif
diff --git a/settings.gradle b/settings.gradle
index e9e2cce104..464936b4e5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,6 +4,7 @@ exec {
 include ':library'
 include ':library:pmd'
 include ':library:findbugs'
+include ':library:test'
 include ':instrumentation'
 include ':annotation'
 include ':annotation:compiler'