Index: test/helper.rb
===================================================================
--- test/helper.rb	(revision 274)
+++ test/helper.rb	(working copy)
@@ -2,10 +2,13 @@
 
 unless defined?(ActiveRecord)
   require File.join(File.dirname(__FILE__), 'boot')
-  require File.join(File.dirname(__FILE__), 'lib', 'activerecord_test_connector')
   require 'action_controller/test_process'
 end
 
+unless defined?(ActiveRecordTestConnector)
+  require File.join(File.dirname(__FILE__), 'lib', 'activerecord_test_connector')
+end
+
 # gem install redgreen for colored test output
 begin require 'redgreen'; rescue LoadError; end
 
Index: init.rb
===================================================================
--- init.rb	(revision 274)
+++ init.rb	(working copy)
@@ -1,6 +1,6 @@
-require 'will_paginate/collection'
-require 'will_paginate/finder'
-require 'will_paginate/view_helpers'
+require File.join(File.dirname(__FILE__), 'lib', 'will_paginate', 'collection')
+require File.join(File.dirname(__FILE__), 'lib', 'will_paginate', 'finder')
+require File.join(File.dirname(__FILE__), 'lib', 'will_paginate', 'view_helpers')
 
 ActiveRecord::Base.send :include, WillPaginate::Finder
 ActionView::Base.send   :include, WillPaginate::ViewHelpers