diff --git a/tests-on-jvm/build.gradle b/tests-on-jvm/build.gradle
index 563a283bd..831e87a39 100644
--- a/tests-on-jvm/build.gradle
+++ b/tests-on-jvm/build.gradle
@@ -13,20 +13,11 @@ dependencies {
 }
 
 sourceSets {
-    main {
-        java {
-            srcDirs = []
-        }
-    }
-
     test {
         compileClasspath += files(project(':k9mail').compileDebugJava.destinationDir)
         compileClasspath += project(':k9mail').compileDebugJava.classpath
         runtimeClasspath += files(project(':k9mail').compileDebugJava.destinationDir)
         runtimeClasspath += project(':k9mail').compileDebugJava.classpath
-        java {
-            srcDirs = ['src']
-        }
     }
 }
 
diff --git a/tests-on-jvm/src/android/text/TextUtils.java b/tests-on-jvm/src/test/java/android/text/TextUtils.java
similarity index 100%
rename from tests-on-jvm/src/android/text/TextUtils.java
rename to tests-on-jvm/src/test/java/android/text/TextUtils.java
diff --git a/tests-on-jvm/src/android/util/Log.java b/tests-on-jvm/src/test/java/android/util/Log.java
similarity index 100%
rename from tests-on-jvm/src/android/util/Log.java
rename to tests-on-jvm/src/test/java/android/util/Log.java
diff --git a/tests-on-jvm/src/com/fsck/k9/K9.java b/tests-on-jvm/src/test/java/com/fsck/k9/K9.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/K9.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/K9.java
diff --git a/tests-on-jvm/src/com/fsck/k9/activity/TextBodyBuilderTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/activity/TextBodyBuilderTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/activity/TextBodyBuilderTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/activity/TextBodyBuilderTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/AddressTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/AddressTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/AddressTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/AddressTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/Address_quoteAtoms.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/Address_quoteAtoms.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/CharsetSupportTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/internet/CharsetSupportTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/DecoderUtilTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/internet/DecoderUtilTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/MimeMessageParseTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/internet/MimeMessageParseTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/MimeUtilityTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/internet/MimeUtilityTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapListTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapListTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java