diff --git a/android/build.gradle b/android/build.gradle
index fbf4f99cd..33b644358 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -22,7 +22,7 @@ android {
 
     sourceSets {
         androidTest {
-            java.srcDirs = ['src/androidTest/java', project(':tests').file('src/main/java')]
+            java.srcDirs = ['src/androidTest/java', project(':tests').file('src/test/java')]
         }
     }
 
diff --git a/java/build.gradle b/java/build.gradle
index fdcc4313e..bbc49f692 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -15,7 +15,7 @@ repositories {
 sourceSets {
     test {
         java {
-            srcDirs = ['src/test/java/', project(':tests').file('src/main/java')]
+            srcDirs = ['src/test/java/', project(':tests').file('src/test/java')]
         }
     }
 }
diff --git a/tests/build.gradle b/tests/build.gradle
index bc71da90c..013779e74 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -6,7 +6,6 @@ repositories {
 }
 
 dependencies {
-    compile 'junit:junit:3.8.2'
     testCompile 'junit:junit:3.8.2'
 
     compile project(':java')
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/InMemoryAxolotlStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryAxolotlStore.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/InMemoryAxolotlStore.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/InMemoryAxolotlStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/InMemoryIdentityKeyStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryIdentityKeyStore.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/InMemoryIdentityKeyStore.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/InMemoryIdentityKeyStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/InMemoryPreKeyStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/InMemoryPreKeyStore.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/InMemoryPreKeyStore.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/InMemoryPreKeyStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/InMemorySessionStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/InMemorySessionStore.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/InMemorySessionStore.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/InMemorySessionStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/InMemorySignedPreKeyStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/InMemorySignedPreKeyStore.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/InMemorySignedPreKeyStore.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/InMemorySignedPreKeyStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/SessionBuilderTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/SessionBuilderTest.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/SessionBuilderTest.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/SessionBuilderTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/SessionCipherTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/SessionCipherTest.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/SessionCipherTest.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/SessionCipherTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java b/tests/src/test/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/SimultaneousInitiateTests.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/ecc/Curve25519Test.java b/tests/src/test/java/org/whispersystems/libaxolotl/ecc/Curve25519Test.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/ecc/Curve25519Test.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/ecc/Curve25519Test.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/groups/GroupCipherTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/groups/GroupCipherTest.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/groups/GroupCipherTest.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/groups/GroupCipherTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/groups/InMemorySenderKeyStore.java b/tests/src/test/java/org/whispersystems/libaxolotl/groups/InMemorySenderKeyStore.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/groups/InMemorySenderKeyStore.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/groups/InMemorySenderKeyStore.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/kdf/HKDFTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/kdf/HKDFTest.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/kdf/HKDFTest.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/kdf/HKDFTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/ratchet/ChainKeyTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/ChainKeyTest.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/ratchet/ChainKeyTest.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/ratchet/ChainKeyTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/ratchet/RatchetingSessionTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RatchetingSessionTest.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/ratchet/RatchetingSessionTest.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RatchetingSessionTest.java
diff --git a/tests/src/main/java/org/whispersystems/libaxolotl/ratchet/RootKeyTest.java b/tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RootKeyTest.java
similarity index 100%
rename from tests/src/main/java/org/whispersystems/libaxolotl/ratchet/RootKeyTest.java
rename to tests/src/test/java/org/whispersystems/libaxolotl/ratchet/RootKeyTest.java