diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d347e7404..2ecc79095 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -30,10 +30,6 @@ repositories {
 }
 
 android {
-    val commonTest = "src/commonTest/java"
-    sourceSets["test"].java.srcDir(commonTest)
-    sourceSets["androidTest"].java.srcDirs("src/androidTest/java", commonTest)
-
     bundle {
         language {
             enableSplit = false
diff --git a/app/src/androidTest/java/org/tasks/Freeze.kt b/app/src/androidTest/java/org/tasks/Freeze.kt
new file mode 120000
index 000000000..4c21e797d
--- /dev/null
+++ b/app/src/androidTest/java/org/tasks/Freeze.kt
@@ -0,0 +1 @@
+../../../../test/java/org/tasks/Freeze.kt
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/tasks/SuspendFreeze.kt b/app/src/androidTest/java/org/tasks/SuspendFreeze.kt
new file mode 120000
index 000000000..b2fae140e
--- /dev/null
+++ b/app/src/androidTest/java/org/tasks/SuspendFreeze.kt
@@ -0,0 +1 @@
+../../../../test/java/org/tasks/SuspendFreeze.kt
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/tasks/TestUtilities.kt b/app/src/androidTest/java/org/tasks/TestUtilities.kt
new file mode 120000
index 000000000..59ee154b1
--- /dev/null
+++ b/app/src/androidTest/java/org/tasks/TestUtilities.kt
@@ -0,0 +1 @@
+../../../../test/java/org/tasks/TestUtilities.kt
\ No newline at end of file
diff --git a/app/src/androidTest/java/org/tasks/makers b/app/src/androidTest/java/org/tasks/makers
new file mode 120000
index 000000000..52f1ba675
--- /dev/null
+++ b/app/src/androidTest/java/org/tasks/makers
@@ -0,0 +1 @@
+../../../../test/java/org/tasks/makers
\ No newline at end of file
diff --git a/app/src/commonTest/java/org/tasks/Freeze.kt b/app/src/test/java/org/tasks/Freeze.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/Freeze.kt
rename to app/src/test/java/org/tasks/Freeze.kt
diff --git a/app/src/commonTest/java/org/tasks/SuspendFreeze.kt b/app/src/test/java/org/tasks/SuspendFreeze.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/SuspendFreeze.kt
rename to app/src/test/java/org/tasks/SuspendFreeze.kt
diff --git a/app/src/commonTest/java/org/tasks/TestUtilities.kt b/app/src/test/java/org/tasks/TestUtilities.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/TestUtilities.kt
rename to app/src/test/java/org/tasks/TestUtilities.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/AlarmEntryMaker.kt b/app/src/test/java/org/tasks/makers/AlarmEntryMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/AlarmEntryMaker.kt
rename to app/src/test/java/org/tasks/makers/AlarmEntryMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/CaldavCalendarMaker.kt b/app/src/test/java/org/tasks/makers/CaldavCalendarMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/CaldavCalendarMaker.kt
rename to app/src/test/java/org/tasks/makers/CaldavCalendarMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/CaldavTaskMaker.kt b/app/src/test/java/org/tasks/makers/CaldavTaskMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/CaldavTaskMaker.kt
rename to app/src/test/java/org/tasks/makers/CaldavTaskMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/GeofenceMaker.kt b/app/src/test/java/org/tasks/makers/GeofenceMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/GeofenceMaker.kt
rename to app/src/test/java/org/tasks/makers/GeofenceMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/GoogleTaskListMaker.kt b/app/src/test/java/org/tasks/makers/GoogleTaskListMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/GoogleTaskListMaker.kt
rename to app/src/test/java/org/tasks/makers/GoogleTaskListMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/GoogleTaskMaker.kt b/app/src/test/java/org/tasks/makers/GoogleTaskMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/GoogleTaskMaker.kt
rename to app/src/test/java/org/tasks/makers/GoogleTaskMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/GtaskListMaker.kt b/app/src/test/java/org/tasks/makers/GtaskListMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/GtaskListMaker.kt
rename to app/src/test/java/org/tasks/makers/GtaskListMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/Maker.kt b/app/src/test/java/org/tasks/makers/Maker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/Maker.kt
rename to app/src/test/java/org/tasks/makers/Maker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/PlaceMaker.kt b/app/src/test/java/org/tasks/makers/PlaceMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/PlaceMaker.kt
rename to app/src/test/java/org/tasks/makers/PlaceMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/RemoteGtaskListMaker.kt b/app/src/test/java/org/tasks/makers/RemoteGtaskListMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/RemoteGtaskListMaker.kt
rename to app/src/test/java/org/tasks/makers/RemoteGtaskListMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/TagDataMaker.kt b/app/src/test/java/org/tasks/makers/TagDataMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/TagDataMaker.kt
rename to app/src/test/java/org/tasks/makers/TagDataMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/TagMaker.kt b/app/src/test/java/org/tasks/makers/TagMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/TagMaker.kt
rename to app/src/test/java/org/tasks/makers/TagMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/TaskContainerMaker.kt b/app/src/test/java/org/tasks/makers/TaskContainerMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/TaskContainerMaker.kt
rename to app/src/test/java/org/tasks/makers/TaskContainerMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/TaskMaker.kt b/app/src/test/java/org/tasks/makers/TaskMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/TaskMaker.kt
rename to app/src/test/java/org/tasks/makers/TaskMaker.kt
diff --git a/app/src/commonTest/java/org/tasks/makers/iCalMaker.kt b/app/src/test/java/org/tasks/makers/iCalMaker.kt
similarity index 100%
rename from app/src/commonTest/java/org/tasks/makers/iCalMaker.kt
rename to app/src/test/java/org/tasks/makers/iCalMaker.kt