diff --git a/app/src/test/java/com/todoroo/astrid/repeats/RepeatHourlyTests.kt b/app/src/test/java/com/todoroo/astrid/repeats/RepeatHourlyTests.kt
index 07fd1d57d..7d6fcf698 100644
--- a/app/src/test/java/com/todoroo/astrid/repeats/RepeatHourlyTests.kt
+++ b/app/src/test/java/com/todoroo/astrid/repeats/RepeatHourlyTests.kt
@@ -17,6 +17,20 @@ class RepeatHourlyTests : RepeatTests() {
         assertEquals(newDayTime(2016, 8, 26, 18, 30), next)
     }
 
+    @Test
+    fun testRepeatHourlyNoInterval() {
+        val task = newFromDue(
+            "FREQ=HOURLY",
+            newDayTime(2016, 8, 30, 0, 25),
+            with(COMPLETION_TIME, DateTime(2016, 8, 29, 0, 14, 13, 451)),
+            afterComplete = true
+        )
+
+        val next = calculateNextDueDate(task)
+
+        assertEquals(newDayTime(2016, 8, 29, 1, 14), next)
+    }
+
     @Test
     fun testRepeatHourlyFromCompleteDateCompleteBefore() {
         val task = newFromDue(
diff --git a/app/src/test/java/com/todoroo/astrid/repeats/RepeatMinutelyTests.kt b/app/src/test/java/com/todoroo/astrid/repeats/RepeatMinutelyTests.kt
index 7c2128d69..b1f130c9d 100644
--- a/app/src/test/java/com/todoroo/astrid/repeats/RepeatMinutelyTests.kt
+++ b/app/src/test/java/com/todoroo/astrid/repeats/RepeatMinutelyTests.kt
@@ -16,6 +16,15 @@ class RepeatMinutelyTests : RepeatTests() {
         assertEquals(newDayTime(2016, 8, 26, 13, 0), next)
     }
 
+    @Test
+    fun testRepeatMinutelyFromDueDateNoInterval() {
+        val task = newFromDue("FREQ=MINUTELY", newDayTime(2016, 8, 26, 12, 30))
+
+        val next = calculateNextDueDate(task)
+
+        assertEquals(newDayTime(2016, 8, 26, 12, 31), next)
+    }
+
     @Test
     fun testRepeatMinutelyFromCompleteDateCompleteBefore() {
         val task = newFromDue(
diff --git a/app/src/test/java/com/todoroo/astrid/repeats/RepeatWeeklyTests.kt b/app/src/test/java/com/todoroo/astrid/repeats/RepeatWeeklyTests.kt
index 0cb118225..37e340944 100644
--- a/app/src/test/java/com/todoroo/astrid/repeats/RepeatWeeklyTests.kt
+++ b/app/src/test/java/com/todoroo/astrid/repeats/RepeatWeeklyTests.kt
@@ -15,6 +15,15 @@ class RepeatWeeklyTests : RepeatTests() {
         assertEquals(newDayTime(2016, 9, 4, 1, 34), next)
     }
 
+    @Test
+    fun testRepeatWeeklyFromDueDateNoInterval() {
+        val task = newFromDue("FREQ=WEEKLY", newDayTime(2016, 8, 28, 1, 34))
+
+        val next = calculateNextDueDate(task)
+
+        assertEquals(newDayTime(2016, 9, 4, 1, 34), next)
+    }
+
     @Test
     fun testRepeatBiWeekly() {
         val task = newFromDue("FREQ=WEEKLY;INTERVAL=2", newDayTime(2016, 8, 28, 1, 34))
diff --git a/app/src/test/java/com/todoroo/astrid/repeats/RepeatYearlyTests.kt b/app/src/test/java/com/todoroo/astrid/repeats/RepeatYearlyTests.kt
index 69aa6e430..243025666 100644
--- a/app/src/test/java/com/todoroo/astrid/repeats/RepeatYearlyTests.kt
+++ b/app/src/test/java/com/todoroo/astrid/repeats/RepeatYearlyTests.kt
@@ -15,6 +15,15 @@ class RepeatYearlyTests : RepeatTests() {
         assertEquals(newDayTime(2018, 8, 28, 1, 44), next)
     }
 
+    @Test
+    fun testRepeatYearlyFromDueDateNoInterval() {
+        val task = newFromDue("FREQ=YEARLY", newDayTime(2016, 8, 28, 1, 44))
+
+        val next = calculateNextDueDate(task)
+
+        assertEquals(newDayTime(2017, 8, 28, 1, 44), next)
+    }
+
     @Test
     fun testRepeatYearlyFromCompleteDateCompleteBefore() {
         val task = newFromDue(