diff --git a/config/environments/test.rb b/config/environments/test.rb
index 62e5b507..c9695e9f 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -19,8 +19,9 @@ config.action_mailer.delivery_method = :test
 # Disable request forgery protection in test environment
 config.action_controller.allow_forgery_protection    = false
 
-# Unique cookies
-config.action_controller.session = { :key => 'TracksTest' }
+# Unique cookies and use cookies for session
+config.action_controller.session_store = :cookie_store
+config.action_controller.session = { :key => 'TracksTest', :secret => SITE_CONFIG['salt'] * (30.0 /  SITE_CONFIG['salt'].length).ceil }
 
 # Overwrite the default settings for fixtures in tests. See Fixtures 
 # for more details about these settings.
diff --git a/test/integration/stories_test.rb b/test/integration/stories_test.rb
index 20912b6e..8ec5d474 100644
--- a/test/integration/stories_test.rb
+++ b/test/integration/stories_test.rb
@@ -30,7 +30,7 @@ class StoriesTest < ActionController::IntegrationTest
       attr_reader :user
 
       def logs_in_as(user,plain_pass)
-        @user = users(user)
+        @user = user
         post "/login", :user_login => @user.login, 
                       :user_password => plain_pass, 
                       :user_noexpiry => 'n'
@@ -72,7 +72,7 @@ class StoriesTest < ActionController::IntegrationTest
       open_session do |sess|
         sess.extend(CustomAssertions)
         sess.goes_to_login
-        sess.logs_in_as(user,plainpass)
+        sess.logs_in_as(users(user),plainpass)
         yield sess if block_given?
       end
     end