diff --git a/test/functional/login_controller_test.rb b/test/functional/login_controller_test.rb
index 1339c90a..50da6ae8 100644
--- a/test/functional/login_controller_test.rb
+++ b/test/functional/login_controller_test.rb
@@ -90,7 +90,7 @@ class LoginControllerTest < ActionController::TestCase
   def test_should_delete_token_on_logout
     login_as :other_user
     get :logout
-    assert_equal @response.cookies["auth_token"], []
+    assert_nil @response.cookies["auth_token"]
   end
 
   def test_should_login_with_cookie
diff --git a/test/functional/todos_controller_test.rb b/test/functional/todos_controller_test.rb
index dfd5206a..cc02dbac 100644
--- a/test/functional/todos_controller_test.rb
+++ b/test/functional/todos_controller_test.rb
@@ -466,10 +466,8 @@ class TodosControllerTest < ActionController::TestCase
     # check that the new_todo is in the tickler to show next month
     assert !new_todo.show_from.nil?
 
-    # use Time.zone.local and not today+1.month because the latter messes up
-    # the timezone. 
-    next_month = Time.zone.local(today.year, today.month+1, today.day)
-    assert_equal next_month.to_s(:db), new_todo.show_from.to_s(:db)
+    next_month = today + 1.month
+    assert_equal next_month.to_date.to_s(:db), new_todo.show_from.to_date.to_s(:db)
   end
 
   def test_check_for_next_todo