4 files changed, 11 insertions, 7 deletions
diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index ade29140ba..0cdf5c2298 100644
--- a/actionpack/test/abstract/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-ActionController::Base.helpers_dir = File.dirname(__FILE__) + '/../fixtures/helpers'
+ActionController::Base.helpers_path = [File.dirname(__FILE__) + '/../fixtures/helpers']
 
 module AbstractController
   module Testing
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index 9030e562bb..fe0961e575 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'active_support/core_ext/kernel/reporting'
 
-ActionController::Base.helpers_dir = File.dirname(__FILE__) + '/../fixtures/helpers'
+ActionController::Base.helpers_path = [File.dirname(__FILE__) + '/../fixtures/helpers']
 
 module Fun
   class GamesController < ActionController::Base
@@ -106,7 +106,7 @@ class HelperTest < Test::Unit::TestCase
   end
 
   def test_all_helpers_with_alternate_helper_dir
-    @controller_class.helpers_dir = File.dirname(__FILE__) + '/../fixtures/alternate_helpers'
+    @controller_class.helpers_path = [File.dirname(__FILE__) + '/../fixtures/alternate_helpers']
 
     # Reload helpers
     @controller_class._helpers = Module.new
diff --git a/actionpack/test/fixtures/helpers/fun/games_helper.rb b/actionpack/test/fixtures/helpers/fun/games_helper.rb
index bf60d9db0c..3b7adce086 100644
--- a/actionpack/test/fixtures/helpers/fun/games_helper.rb
+++ b/actionpack/test/fixtures/helpers/fun/games_helper.rb
@@ -1,3 +1,5 @@
-module Fun::GamesHelper
-  def stratego() "Iz guuut!" end
+module Fun
+  module GamesHelper
+    def stratego() "Iz guuut!" end
+  end
 end
 \ No newline at end of file
diff --git a/actionpack/test/fixtures/helpers/fun/pdf_helper.rb b/actionpack/test/fixtures/helpers/fun/pdf_helper.rb
index c4aea5a3f3..0171be8500 100644
--- a/actionpack/test/fixtures/helpers/fun/pdf_helper.rb
+++ b/actionpack/test/fixtures/helpers/fun/pdf_helper.rb
@@ -1,3 +1,5 @@
-module Fun::PdfHelper
-  def foobar() 'baz' end
+module Fun
+  module PdfHelper
+    def foobar() 'baz' end
+  end
 end