diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index e131245cea72ce8ebb65c0620a7da63276e36383..bd8eb1c33d2c67ce42bdf4c121ac26f405d66bbb 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed the test_helper.rb to be safe for requiring controllers from multiple spots, like app/controllers/article_controller.rb and app/controllers/admin/article_controller.rb, without reloading the environment twice #1390 [Nicholas Seckar]
+
 * Fixed Webrick to escape + characters in URL's the same way that lighttpd and apache do #1397 [Nicholas Seckar]
 
 * Added -e/--environment option to script/runner #1408 [fbeausoleil@ftml.net]
diff --git a/railties/helpers/test_helper.rb b/railties/helpers/test_helper.rb
index d177ec351583e0aaa927d98e84fdd7fb33ef7822..5328ccdf5f04883f5863b020bbdfb0ebf02e39ee 100644
--- a/railties/helpers/test_helper.rb
+++ b/railties/helpers/test_helper.rb
@@ -1,5 +1,8 @@
 ENV["RAILS_ENV"] = "test"
-require File.dirname(__FILE__) + "/../config/environment"
+
+# Expand the path to environment so that Ruby does not load it multiple times
+# File.expand_path can be removed if Ruby 1.9 is in use.
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'application'
 
 require 'test/unit'