diff --git a/Rakefile b/Rakefile
index 6f8e9dd12..001fad791 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,5 +4,5 @@ task :default => :test
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.pattern = 'test/*_test.rb'
+  t.pattern = 'test/**/*_test.rb'
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0594ba252..47faad3bd 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,5 +1,5 @@
 begin
-  require File.join(File.dirname(__FILE__), 'vendor', 'gems', 'environment')
+  require File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment')
 rescue LoadError
   puts <<-ENVERR
 ==================================================