diff --git a/Rakefile b/Rakefile
index 7a82d33..e0e91bd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,6 +8,7 @@ task :default => :test
 desc 'Test the grouped_scope plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
diff --git a/test/grouped_scope_test.rb b/test/grouped_scope_test.rb
index e05c7ab..16daf92 100644
--- a/test/grouped_scope_test.rb
+++ b/test/grouped_scope_test.rb
@@ -1,4 +1,4 @@
-require 'test/helper'
+require 'helper'
 
 class GroupedScopeTest < Test::Unit::TestCase
   
diff --git a/test/helper.rb b/test/helper.rb
index 3c1d16d..b3e35cd 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -2,9 +2,13 @@
 require 'rubygems'
 require 'shoulda'
 require 'mocha'
-require 'test/boot' unless defined?(ActiveRecord)
+require 'boot' unless defined?(ActiveRecord)
 require 'activerecord'
 require 'active_support'
+
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
+$: << File.join(File.dirname(__FILE__), '..', 'lib', 'grouped_scope')
+
 require 'grouped_scope'
 
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__)+'/debug.log')