diff --git a/app/src/androidTest/java/org/tasks/repeats/RepeatRuleToStringTest.kt b/app/src/androidTest/java/org/tasks/repeats/RepeatRuleToStringTest.kt
index c7db063e6..9507eb3f8 100644
--- a/app/src/androidTest/java/org/tasks/repeats/RepeatRuleToStringTest.kt
+++ b/app/src/androidTest/java/org/tasks/repeats/RepeatRuleToStringTest.kt
@@ -121,7 +121,7 @@ class RepeatRuleToStringTest : InjectingTestCase() {
 
     private fun toString(language: String?, rrule: String): String? {
         return try {
-            val locale = Locale(java.util.Locale.getDefault(), language)
+            val locale = language?.let { Locale.forLanguageTag(it) } ?: Locale.getDefault()
             RepeatRuleToString(context, locale, firebase)
                     .toString(rrule)
         } catch (e: ParseException) {
diff --git a/app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt b/app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt
index ba2a7550c..973ec84dd 100644
--- a/app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt
+++ b/app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt
@@ -37,7 +37,12 @@ class ReminderTests : BaseTaskEditViewModelTest() {
         task.defaultReminders(Task.NOTIFY_AT_DEADLINE)
         setup(task)
 
-        viewModel.dueDate = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY_TIME, currentTimeMillis())
+        viewModel.setDueDate(
+            Task.createDueDate(
+                Task.URGENCY_SPECIFIC_DAY_TIME,
+                currentTimeMillis()
+            )
+        )
 
         save()
 
@@ -53,7 +58,12 @@ class ReminderTests : BaseTaskEditViewModelTest() {
         task.defaultReminders(Task.NOTIFY_AFTER_DEADLINE)
         setup(task)
 
-        viewModel.dueDate = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY_TIME, currentTimeMillis())
+        viewModel.setDueDate(
+            Task.createDueDate(
+                Task.URGENCY_SPECIFIC_DAY_TIME,
+                currentTimeMillis()
+            )
+        )
 
         save()