diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index 1029bed06403d6353870ffe353fe3fe3d1364bc1..ce43ae80664b2c802725e282279a06a7ab9a3f99 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -116,7 +116,7 @@ def self.find_by_session_id(*args)
               define_method(:session_id)  { sessid }
               define_method(:session_id=) { |session_id| self.sessid = session_id }
             else
-              class << self; remove_method :find_by_session_id; end
+              class << self; remove_possible_method :find_by_session_id; end
 
               def self.find_by_session_id(session_id)
                 find :first, :conditions => {:session_id=>session_id}
diff --git a/activerecord/test/cases/session_store/session_test.rb b/activerecord/test/cases/session_store/session_test.rb
index bcacbb9b5f4e0bbaf33f912a11e016d121e8ab6f..a3b8ab74d9323055480f7ada88c193df0959be0c 100644
--- a/activerecord/test/cases/session_store/session_test.rb
+++ b/activerecord/test/cases/session_store/session_test.rb
@@ -7,10 +7,13 @@ class SessionStore
     class SessionTest < ActiveRecord::TestCase
       self.use_transactional_fixtures = false
 
+      attr_reader :session_klass
+
       def setup
         super
         ActiveRecord::Base.connection.schema_cache.clear!
         Session.drop_table! if Session.table_exists?
+        @session_klass = Class.new(Session)
       end
 
       def test_data_column_name
@@ -61,8 +64,8 @@ def self.session_id_column
       def test_find_by_session_id
         Session.create_table!
         session_id = "10"
-        s = Session.create!(:data => 'world', :session_id => session_id)
-        t = Session.find_by_session_id(session_id)
+        s = session_klass.create!(:data => 'world', :session_id => session_id)
+        t = session_klass.find_by_session_id(session_id)
         assert_equal s, t
         assert_equal s.data, t.data
         Session.drop_table!