diff --git a/k9mail/build.gradle b/k9mail/build.gradle
index a9efee7da..ff71994bd 100644
--- a/k9mail/build.gradle
+++ b/k9mail/build.gradle
@@ -25,6 +25,14 @@ dependencies {
         exclude group: 'junit'
     }
     androidTestCompile 'com.madgag.spongycastle:pg:1.51.0.0'
+
+    testCompile('org.robolectric:robolectric:3.0-rc3') {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    testCompile 'org.hamcrest:hamcrest-core:1.3'
+    testCompile('junit:junit:4.10') {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
 }
 
 android {
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/helper/HtmlSanitizerTest.java b/k9mail/src/test/java/com/fsck/k9/helper/HtmlSanitizerTest.java
similarity index 100%
rename from tests-on-jvm/src/test/java/com/fsck/k9/helper/HtmlSanitizerTest.java
rename to k9mail/src/test/java/com/fsck/k9/helper/HtmlSanitizerTest.java
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/mail/AddressTest.java b/k9mail/src/test/java/com/fsck/k9/mail/AddressTest.java
similarity index 88%
rename from tests-on-jvm/src/test/java/com/fsck/k9/mail/AddressTest.java
rename to k9mail/src/test/java/com/fsck/k9/mail/AddressTest.java
index 7b9c2b891..d8080f063 100644
--- a/tests-on-jvm/src/test/java/com/fsck/k9/mail/AddressTest.java
+++ b/k9mail/src/test/java/com/fsck/k9/mail/AddressTest.java
@@ -2,10 +2,15 @@ package com.fsck.k9.mail;
 
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertEquals;
 
 
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
 public class AddressTest {
     /**
      * test the possibility to parse "From:" fields with no email.
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java b/k9mail/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java
similarity index 87%
rename from tests-on-jvm/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java
rename to k9mail/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java
index 6de516565..5a2fa88cb 100644
--- a/tests-on-jvm/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java
+++ b/k9mail/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java
@@ -2,10 +2,15 @@ package com.fsck.k9.mail;
 
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertEquals;
 
 
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
 public class Address_quoteAtoms {
     @Test
     public void testNoQuote() {
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java b/k9mail/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java
similarity index 100%
rename from tests-on-jvm/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java
rename to k9mail/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java b/k9mail/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java
similarity index 95%
rename from tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java
rename to k9mail/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java
index d1918be58..3d5141884 100644
--- a/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java
+++ b/k9mail/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java
@@ -2,10 +2,15 @@ package com.fsck.k9.mail.internet;
 
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertEquals;
 
 
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
 public class CharsetSupportTest {
 
     @Test
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java b/k9mail/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java
similarity index 94%
rename from tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java
rename to k9mail/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java
index 0f58ddf70..5a24544c5 100644
--- a/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java
+++ b/k9mail/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java
@@ -2,10 +2,15 @@ package com.fsck.k9.mail.internet;
 
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertEquals;
 
 
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
 public class DecoderUtilTest {
 
     @Test
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java b/k9mail/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java
similarity index 98%
rename from tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java
rename to k9mail/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java
index 3fc7e4b4a..1dcc88f91 100644
--- a/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java
+++ b/k9mail/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java
@@ -18,10 +18,15 @@ import com.fsck.k9.mail.Body;
 import com.fsck.k9.mail.BodyPart;
 import com.fsck.k9.mail.Message.RecipientType;
 import com.fsck.k9.mail.Multipart;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import static org.junit.Assert.assertEquals;
 
 
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
 public class MimeMessageParseTest {
     @Before
     public void setup() {
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java b/k9mail/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java
similarity index 100%
rename from tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java
rename to k9mail/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java b/k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java
similarity index 100%
rename from tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java
rename to k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java b/k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java
similarity index 95%
rename from tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java
rename to k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java
index d9ce8b445..31e867cc5 100644
--- a/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java
+++ b/k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java
@@ -3,6 +3,9 @@ package com.fsck.k9.mail.store.imap;
 import com.fsck.k9.mail.filter.PeekableInputStream;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -16,6 +19,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
 public class ImapResponseParserTest  {
 
     @Test public void testSimpleOkResponse() throws IOException {
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java b/k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java
similarity index 100%
rename from tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java
rename to k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java b/k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
similarity index 96%
rename from tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
rename to k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
index 283660fbb..f91ec80b1 100644
--- a/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
+++ b/k9mail/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
@@ -18,12 +18,17 @@
 package com.fsck.k9.mail.store.imap;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import java.util.List;
 
 import static org.junit.Assert.assertArrayEquals;
 
 
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
 public class ImapUtilityTest  {
     @Test
     public void testGetImapSequenceValues() {
diff --git a/tests-on-jvm/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.java b/k9mail/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.java
similarity index 99%
rename from tests-on-jvm/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.java
rename to k9mail/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.java
index afb95eb2f..cf6b03fcb 100644
--- a/tests-on-jvm/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.java
+++ b/k9mail/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.java
@@ -3,6 +3,7 @@ package com.fsck.k9.message;
 import com.fsck.k9.Account.QuoteStyle;
 import com.fsck.k9.mail.internet.TextBody;
 
+import org.junit.Ignore;
 import org.junit.experimental.theories.DataPoints;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
@@ -12,6 +13,8 @@ import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
+//TODO: Get rid of 'Theories' and write simple tests
+@Ignore
 @RunWith(Theories.class)
 public class TextBodyBuilderTest {
 
diff --git a/settings.gradle b/settings.gradle
index a39b9d813..febff8e7f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,4 +3,3 @@ include ':k9mail-library'
 include ':plugins:Android-PullToRefresh:library'
 include ':plugins:HoloColorPicker'
 include ':plugins:openpgp-api-library'
-include ':tests-on-jvm'