diff --git a/app/build.gradle b/app/build.gradle
index d9a999a..feb422d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,6 +27,9 @@ android {
         main {
             java.srcDirs += 'src/main/kotlin'
         }
+        test {
+            java.srcDirs += 'src/test/kotlin'
+        }
     }
     dataBinding {
         enabled = true
diff --git a/app/src/androidTest/java/me/rocka/mokeedelta/ExampleInstrumentedTest.kt b/app/src/androidTest/java/me/rocka/mokeedelta/ExampleInstrumentedTest.kt
deleted file mode 100644
index 5743fc4..0000000
--- a/app/src/androidTest/java/me/rocka/mokeedelta/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package me.rocka.mokeedelta
-
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("me.rocka.mokeedelta", appContext.packageName)
-    }
-}
diff --git a/app/src/test/java/android/util/Log.kt b/app/src/test/kotlin/android/util/Log.kt
similarity index 100%
rename from app/src/test/java/android/util/Log.kt
rename to app/src/test/kotlin/android/util/Log.kt
diff --git a/app/src/test/java/me/rocka/mokeedelta/util/ParserTest.kt b/app/src/test/kotlin/me/rocka/mokeedelta/util/ParserTest.kt
similarity index 100%
rename from app/src/test/java/me/rocka/mokeedelta/util/ParserTest.kt
rename to app/src/test/kotlin/me/rocka/mokeedelta/util/ParserTest.kt
diff --git a/app/src/test/java/me/rocka/mokeedelta/util/RequestTest.kt b/app/src/test/kotlin/me/rocka/mokeedelta/util/RequestTest.kt
similarity index 100%
rename from app/src/test/java/me/rocka/mokeedelta/util/RequestTest.kt
rename to app/src/test/kotlin/me/rocka/mokeedelta/util/RequestTest.kt