diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index 43c76a2..634e3f8 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -44,13 +44,54 @@ class SessionsControllerTest < ActionController::TestCase
     should_set_the_flash_to /signed in/i
     should_redirect_to_url_after_create

-    should_set_cookie("remember_token", "old-token", Clearance.configuration.cookie_expiration.call)
+    should_set_cookie("remember_token", "old-token", 1.year.from_now)
+      # check that default (unconfigured) behavior is correct

     should "not change the remember token" do
       assert_equal "old-token", @user.reload.remember_token
     end
   end

+  context "on POST to #create with good credentials - cookie duration set to 2 weeks" do
+    setup do
+      Clearance.configuration.cookie_expiration = lambda {2.weeks.from_now.utc}
+      @user = Factory(:email_confirmed_user)
+      @user.update_attribute(:remember_token, "old-token2")
+      post :create, :session => {
+                      :email    => @user.email,
+                      :password => @user.password }
+    end
+
+    should_set_cookie("remember_token", "old-token2", 2.weeks.from_now)
+
+    teardown do
+      # restore default Clearance configuration
+      Clearance.configuration = nil
+      Clearance.configure {}
+    end
+
+  end
+
+  context "on POST to #create with good credentials - cookie expiration set to nil (session cookie)" do
+    setup do
+      Clearance.configuration.cookie_expiration = lambda {nil}
+      @user = Factory(:email_confirmed_user)
+      @user.update_attribute(:remember_token, "old-token3")
+      post :create, :session => {
+                      :email    => @user.email,
+                      :password => @user.password }
+    end
+
+    should_set_cookie("remember_token", "old-token3", nil)
+
+    teardown do
+      # restore default Clearance configuration
+      Clearance.configuration = nil
+      Clearance.configure {}
+    end
+
+  end
+
   context "on POST to #create with good credentials and a session return url" do
     setup do
       @user = Factory(:email_confirmed_user)