diff --git a/test/unit/todo_test.rb b/test/unit/todo_test.rb
index 26347c7a..470c5f60 100644
--- a/test/unit/todo_test.rb
+++ b/test/unit/todo_test.rb
@@ -127,6 +127,20 @@ class TodoTest < ActiveSupport::TestCase
     assert t.active?
   end
 
+  def test_activate_also_clears_show_from
+    # setup test case
+    t = @not_completed1
+    t.show_from = 1.week.from_now
+    t.save!
+    assert t.deferred?
+    t.reload
+
+    # activate and check show_from
+    t.activate!
+    assert t.active?
+    assert t.show_from.nil?
+  end
+
   def test_project_returns_null_object_when_nil
     t = @not_completed1
     assert !t.project.is_a?(NullProject)