diff --git a/build.gradle b/build.gradle
index 61d10c7b5..feac0bb8f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,7 @@ dependencies {
     implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4' // glues the current time segment text in the gallery to the top.
     implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:7.2.0'
 
-    implementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.assertj:assertj-core:1.7.1'
     testImplementation 'org.mockito:mockito-core:1.9.5'
@@ -194,6 +194,9 @@ android {
             assets.srcDirs = ['assets']
             jniLibs.srcDirs = ['libs']
         }
+        test {
+            java.srcDirs = ['test']
+        }
     }
 
      lintOptions {
diff --git a/src/test/java/org/thoughtcrime/securesms/map/model/FeatureTreeSetTest.java b/test/org/thoughtcrime/securesms/map/model/FeatureTreeSetTest.java
similarity index 100%
rename from src/test/java/org/thoughtcrime/securesms/map/model/FeatureTreeSetTest.java
rename to test/org/thoughtcrime/securesms/map/model/FeatureTreeSetTest.java
diff --git a/src/test/java/org/thoughtcrime/securesms/map/model/TimeComparableFeatureTest.java b/test/org/thoughtcrime/securesms/map/model/TimeComparableFeatureTest.java
similarity index 100%
rename from src/test/java/org/thoughtcrime/securesms/map/model/TimeComparableFeatureTest.java
rename to test/org/thoughtcrime/securesms/map/model/TimeComparableFeatureTest.java
diff --git a/src/test/java/utils/TestUtils.java b/test/utils/TestUtils.java
similarity index 100%
rename from src/test/java/utils/TestUtils.java
rename to test/utils/TestUtils.java