diff --git a/build.gradle b/build.gradle
index e228ec9cae..52dcb2d08d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -200,10 +200,7 @@ android {
             assets.srcDirs = ['assets']
         }
         androidTest {
-            java.srcDirs = ['androidTest/java']
-            resources.srcDirs = ['androidTest/java']
-            aidl.srcDirs = ['androidTest/java']
-            renderscript.srcDirs = ['androidTest/java']
+            java.srcDirs = ['test/androidTest/java']
         }
     }
 
diff --git a/androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java b/test/androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java
rename to test/androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/database/CanonicalAddressDatabaseTest.java b/test/androidTest/java/org/thoughtcrime/securesms/database/CanonicalAddressDatabaseTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/database/CanonicalAddressDatabaseTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/database/CanonicalAddressDatabaseTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/database/PartDatabaseTest.java b/test/androidTest/java/org/thoughtcrime/securesms/database/PartDatabaseTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/database/PartDatabaseTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/database/PartDatabaseTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java b/test/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java b/test/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java b/test/androidTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/service/SmsListenerTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java b/test/androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java b/test/androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java
diff --git a/androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java b/test/androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java
similarity index 100%
rename from androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java
rename to test/androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java