diff --git a/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.kt b/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.kt
index 6180532dc..56e6d9e2d 100644
--- a/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.kt
+++ b/app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.kt
@@ -44,7 +44,6 @@ abstract class SubtasksTestCase : InjectingTestCase() {
    * E
    * F
    */
-        @JvmField
         val DEFAULT_SERIALIZED_TREE = "[-1, [1, 2, [3, 4]], 5, 6]".replace("\\s".toRegex(), "")
     }
 }
\ 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
index b5b5ebced..7d4c266ba 100644
--- a/app/src/androidTest/java/org/tasks/TestUtilities.kt
+++ b/app/src/androidTest/java/org/tasks/TestUtilities.kt
@@ -13,7 +13,7 @@ import java.io.StringReader
 
 object TestUtilities {
     private var mockitoInitialized = false
-    @JvmStatic
+
     fun initializeMockito(context: Context) {
         if (!mockitoInitialized) {
             // for mockito: https://code.google.com/p/dexmaker/issues/detail?id=2
@@ -22,12 +22,10 @@ object TestUtilities {
         }
     }
 
-    @JvmStatic
     fun newPreferences(context: Context?): Preferences {
         return Preferences(context, "test_preferences")
     }
 
-    @JvmStatic
     fun vtodo(path: String): Task {
         val task = Task()
         CaldavConverter.apply(task, fromResource(path))
diff --git a/app/src/androidTest/java/org/tasks/makers/CaldavTaskMaker.kt b/app/src/androidTest/java/org/tasks/makers/CaldavTaskMaker.kt
index 3829a245c..6cd00b63a 100644
--- a/app/src/androidTest/java/org/tasks/makers/CaldavTaskMaker.kt
+++ b/app/src/androidTest/java/org/tasks/makers/CaldavTaskMaker.kt
@@ -8,10 +8,10 @@ import org.tasks.data.CaldavTask
 import org.tasks.makers.Maker.make
 
 object CaldavTaskMaker {
-    @JvmField val CALENDAR: Property<CaldavTask, String> = newProperty()
-    @JvmField val TASK: Property<CaldavTask, Long> = newProperty()
-    @JvmField val REMOTE_ID: Property<CaldavTask, String?> = newProperty()
-    @JvmField val REMOTE_PARENT: Property<CaldavTask, String?> = newProperty()
+    val CALENDAR: Property<CaldavTask, String> = newProperty()
+    val TASK: Property<CaldavTask, Long> = newProperty()
+    val REMOTE_ID: Property<CaldavTask, String?> = newProperty()
+    val REMOTE_PARENT: Property<CaldavTask, String?> = newProperty()
 
     private val instantiator = Instantiator<CaldavTask> {
         val task = CaldavTask(it.valueOf(TASK, 1L), it.valueOf(CALENDAR, "calendar"))
@@ -20,7 +20,6 @@ object CaldavTaskMaker {
         task
     }
 
-    @JvmStatic
     fun newCaldavTask(vararg properties: PropertyValue<in CaldavTask?, *>): CaldavTask {
         return make(instantiator, *properties)
     }
diff --git a/app/src/androidTest/java/org/tasks/makers/GoogleTaskMaker.kt b/app/src/androidTest/java/org/tasks/makers/GoogleTaskMaker.kt
index 122ae991f..b09869466 100644
--- a/app/src/androidTest/java/org/tasks/makers/GoogleTaskMaker.kt
+++ b/app/src/androidTest/java/org/tasks/makers/GoogleTaskMaker.kt
@@ -9,11 +9,11 @@ import org.tasks.data.GoogleTask
 import org.tasks.makers.Maker.make
 
 object GoogleTaskMaker {
-    @JvmField val LIST: Property<GoogleTask, String> = newProperty()
+    val LIST: Property<GoogleTask, String> = newProperty()
     val ORDER: Property<GoogleTask, Int> = newProperty()
-    @JvmField val REMOTE_ID: Property<GoogleTask, String> = newProperty()
-    @JvmField val TASK: Property<GoogleTask, Int> = newProperty()
-    @JvmField val PARENT: Property<GoogleTask, Long> = newProperty()
+    val REMOTE_ID: Property<GoogleTask, String> = newProperty()
+    val TASK: Property<GoogleTask, Int> = newProperty()
+    val PARENT: Property<GoogleTask, Long> = newProperty()
 
     private val instantiator = Instantiator<GoogleTask> {
         val task = GoogleTask()
@@ -25,7 +25,6 @@ object GoogleTaskMaker {
         task
     }
 
-    @JvmStatic
     fun newGoogleTask(vararg properties: PropertyValue<in GoogleTask?, *>): GoogleTask {
         return make(instantiator, *properties)
     }
diff --git a/app/src/androidTest/java/org/tasks/makers/GtaskListMaker.kt b/app/src/androidTest/java/org/tasks/makers/GtaskListMaker.kt
index c926d556e..833cf512b 100644
--- a/app/src/androidTest/java/org/tasks/makers/GtaskListMaker.kt
+++ b/app/src/androidTest/java/org/tasks/makers/GtaskListMaker.kt
@@ -9,11 +9,11 @@ import org.tasks.data.GoogleTaskList
 import org.tasks.makers.Maker.make
 
 object GtaskListMaker {
-    @JvmField val ID: Property<GoogleTaskList, Long> = newProperty()
+    val ID: Property<GoogleTaskList, Long> = newProperty()
     val ACCOUNT: Property<GoogleTaskList, String> = newProperty()
-    @JvmField val REMOTE_ID: Property<GoogleTaskList, String> = newProperty()
+    val REMOTE_ID: Property<GoogleTaskList, String> = newProperty()
     val LAST_SYNC: Property<GoogleTaskList, Long> = newProperty()
-    @JvmField val NAME: Property<GoogleTaskList, String> = newProperty()
+    val NAME: Property<GoogleTaskList, String> = newProperty()
     private val ORDER: Property<GoogleTaskList, Int> = newProperty()
     private val COLOR: Property<GoogleTaskList, Int> = newProperty()
 
@@ -29,7 +29,6 @@ object GtaskListMaker {
         list
     }
 
-    @JvmStatic
     fun newGtaskList(vararg properties: PropertyValue<in GoogleTaskList?, *>): GoogleTaskList {
         return make(instantiator, *properties)
     }
diff --git a/app/src/androidTest/java/org/tasks/makers/Maker.kt b/app/src/androidTest/java/org/tasks/makers/Maker.kt
index 773a4ce17..bfc8aa86e 100644
--- a/app/src/androidTest/java/org/tasks/makers/Maker.kt
+++ b/app/src/androidTest/java/org/tasks/makers/Maker.kt
@@ -5,7 +5,6 @@ import com.natpryce.makeiteasy.MakeItEasy
 import com.natpryce.makeiteasy.PropertyValue
 
 internal object Maker {
-    @JvmStatic
     fun <T> make(instantiator: Instantiator<T>, vararg properties: PropertyValue<in T, *>?): T {
         return MakeItEasy.make(MakeItEasy.a(instantiator, *properties))
     }
diff --git a/app/src/androidTest/java/org/tasks/makers/RemoteGtaskListMaker.kt b/app/src/androidTest/java/org/tasks/makers/RemoteGtaskListMaker.kt
index 013f09c6d..06f019bf4 100644
--- a/app/src/androidTest/java/org/tasks/makers/RemoteGtaskListMaker.kt
+++ b/app/src/androidTest/java/org/tasks/makers/RemoteGtaskListMaker.kt
@@ -11,8 +11,8 @@ import org.tasks.makers.Maker.make
 import org.tasks.time.DateTimeUtils
 
 object RemoteGtaskListMaker {
-    @JvmField val REMOTE_ID: Property<TaskList, String> = newProperty()
-    @JvmField val NAME: Property<TaskList, String> = newProperty()
+    val REMOTE_ID: Property<TaskList, String> = newProperty()
+    val NAME: Property<TaskList, String> = newProperty()
 
     private val instantiator = Instantiator { lookup: PropertyLookup<TaskList> ->
         TaskList()
@@ -21,7 +21,6 @@ object RemoteGtaskListMaker {
                 .setUpdated(DateTime(DateTimeUtils.currentTimeMillis()))
     }
 
-    @JvmStatic
     fun newRemoteList(vararg properties: PropertyValue<in TaskList?, *>): TaskList {
         return make(instantiator, *properties)
     }
diff --git a/app/src/androidTest/java/org/tasks/makers/TagDataMaker.kt b/app/src/androidTest/java/org/tasks/makers/TagDataMaker.kt
index 6a793cc8c..ace76de9c 100644
--- a/app/src/androidTest/java/org/tasks/makers/TagDataMaker.kt
+++ b/app/src/androidTest/java/org/tasks/makers/TagDataMaker.kt
@@ -9,7 +9,7 @@ import org.tasks.data.TagData
 import org.tasks.makers.Maker.make
 
 object TagDataMaker {
-    @JvmField val NAME: Property<TagData, String> = newProperty()
+    val NAME: Property<TagData, String> = newProperty()
     val UID: Property<TagData, String?> = newProperty()
 
     private val instantiator = Instantiator { lookup: PropertyLookup<TagData> ->
@@ -19,7 +19,6 @@ object TagDataMaker {
         tagData
     }
 
-    @JvmStatic
     fun newTagData(vararg properties: PropertyValue<in TagData?, *>): TagData {
         return make(instantiator, *properties)
     }
diff --git a/app/src/androidTest/java/org/tasks/makers/TagMaker.kt b/app/src/androidTest/java/org/tasks/makers/TagMaker.kt
index 072f30908..afd6392fd 100644
--- a/app/src/androidTest/java/org/tasks/makers/TagMaker.kt
+++ b/app/src/androidTest/java/org/tasks/makers/TagMaker.kt
@@ -11,9 +11,9 @@ import org.tasks.data.TagData
 import org.tasks.makers.Maker.make
 
 object TagMaker {
-    @JvmField val TAGDATA: Property<Tag, TagData?> = newProperty()
-    @JvmField val TASK: Property<Tag, Task?> = newProperty()
-    @JvmField val TAGUID: Property<Tag, String?> = newProperty()
+    val TAGDATA: Property<Tag, TagData?> = newProperty()
+    val TASK: Property<Tag, Task?> = newProperty()
+    val TAGUID: Property<Tag, String?> = newProperty()
 
     private val instantiator = Instantiator { lookup: PropertyLookup<Tag> ->
         val tag = Tag()
@@ -29,7 +29,6 @@ object TagMaker {
         tag
     }
 
-    @JvmStatic
     fun newTag(vararg properties: PropertyValue<in Tag?, *>): Tag {
         return make(instantiator, *properties)
     }
diff --git a/app/src/androidTest/java/org/tasks/makers/TaskMaker.kt b/app/src/androidTest/java/org/tasks/makers/TaskMaker.kt
index c1a939655..0aaecbd82 100644
--- a/app/src/androidTest/java/org/tasks/makers/TaskMaker.kt
+++ b/app/src/androidTest/java/org/tasks/makers/TaskMaker.kt
@@ -13,22 +13,22 @@ import org.tasks.makers.Maker.make
 import org.tasks.time.DateTime
 
 object TaskMaker {
-    @JvmField val ID: Property<Task, Long> = newProperty()
-    @JvmField val DUE_DATE: Property<Task, DateTime?> = newProperty()
-    @JvmField val DUE_TIME: Property<Task, DateTime?> = newProperty()
-    @JvmField val REMINDER_LAST: Property<Task, DateTime?> = newProperty()
-    @JvmField val RANDOM_REMINDER_PERIOD: Property<Task, Long> = newProperty()
-    @JvmField val HIDE_TYPE: Property<Task, Int> = newProperty()
-    @JvmField val REMINDERS: Property<Task, Int> = newProperty()
-    @JvmField val CREATION_TIME: Property<Task, DateTime> = newProperty()
-    @JvmField val COMPLETION_TIME: Property<Task, DateTime> = newProperty()
-    @JvmField val DELETION_TIME: Property<Task, DateTime?> = newProperty()
-    @JvmField val SNOOZE_TIME: Property<Task, DateTime?> = newProperty()
-    @JvmField val RRULE: Property<Task, RRule?> = newProperty()
-    @JvmField val AFTER_COMPLETE: Property<Task, Boolean> = newProperty()
+    val ID: Property<Task, Long> = newProperty()
+    val DUE_DATE: Property<Task, DateTime?> = newProperty()
+    val DUE_TIME: Property<Task, DateTime?> = newProperty()
+    val REMINDER_LAST: Property<Task, DateTime?> = newProperty()
+    val RANDOM_REMINDER_PERIOD: Property<Task, Long> = newProperty()
+    val HIDE_TYPE: Property<Task, Int> = newProperty()
+    val REMINDERS: Property<Task, Int> = newProperty()
+    val CREATION_TIME: Property<Task, DateTime> = newProperty()
+    val COMPLETION_TIME: Property<Task, DateTime> = newProperty()
+    val DELETION_TIME: Property<Task, DateTime?> = newProperty()
+    val SNOOZE_TIME: Property<Task, DateTime?> = newProperty()
+    val RRULE: Property<Task, RRule?> = newProperty()
+    val AFTER_COMPLETE: Property<Task, Boolean> = newProperty()
     private val TITLE: Property<Task, String?> = newProperty()
     private val PRIORITY: Property<Task, Int> = newProperty()
-    @JvmField val PARENT: Property<Task, Long> = newProperty()
+    val PARENT: Property<Task, Long> = newProperty()
 
     private val instantiator = Instantiator { lookup: PropertyLookup<Task> ->
         val task = Task()
@@ -90,7 +90,6 @@ object TaskMaker {
         task
     }
 
-    @JvmStatic
     fun newTask(vararg properties: PropertyValue<in Task?, *>): Task {
         return make(instantiator, *properties)
     }