diff --git a/features/support/env.rb b/features/support/env.rb
index 8687f2234..226bfb4ef 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -44,6 +44,8 @@ require File.join(File.dirname(__FILE__), "integration_sessions_controller")
 
 require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "fake_redis")
 require File.join(File.dirname(__FILE__), "..", "..", "spec", "helper_methods")
+require File.join(File.dirname(__FILE__), "..", "..", "spec", "support","no_id_on_object")
+require File.join(File.dirname(__FILE__), "..", "..", "spec", "support","i18n_raise_errors")
 require File.join(File.dirname(__FILE__), "..", "..", "spec", "support","user_methods")
 include HelperMethods
 Before do
diff --git a/features/support/integration_sessions_controller.rb b/features/support/integration_sessions_controller.rb
index ba47346f7..acd050240 100644
--- a/features/support/integration_sessions_controller.rb
+++ b/features/support/integration_sessions_controller.rb
@@ -1,7 +1,7 @@
-class IntegrationSessionsController < ApplicationController
+class IntegrationSessionsController < ActionController::Base
   def new
     @user_id = params[:user_id]
-    render 'features/support/integration_sessions_form'
+    render 'features/support/integration_sessions_form', :layout => false
   end
   def create
     sign_in_and_redirect User.find(params[:user_id])