diff --git a/lib/prototype-rails.rb b/lib/prototype-rails.rb
index 8739574..8f176f5 100644
--- a/lib/prototype-rails.rb
+++ b/lib/prototype-rails.rb
@@ -10,12 +10,6 @@ class Engine < Rails::Engine
 
       ActiveSupport.on_load(:action_view) do
         require 'prototype-rails/on_load_action_view'
-        if Rails.env.test?
-          ActionView::TestCase.class_eval do
-            include ActionView::Helpers::PrototypeHelper
-            include ActionView::Helpers::ScriptaculousHelper
-          end
-        end
       end
     end
   end
diff --git a/lib/prototype-rails/on_load_action_view.rb b/lib/prototype-rails/on_load_action_view.rb
index 1d5c781..2332d68 100644
--- a/lib/prototype-rails/on_load_action_view.rb
+++ b/lib/prototype-rails/on_load_action_view.rb
@@ -14,4 +14,9 @@
   include ActionView::Helpers::ScriptaculousHelper
 end
 
+ActionView::TestCase.class_eval do
+  include ActionView::Helpers::PrototypeHelper
+  include ActionView::Helpers::ScriptaculousHelper
+end
+
 ActionView::Template.register_template_handler :rjs, ActionView::Template::Handlers::RJS.new
diff --git a/test/lib/abstract_unit.rb b/test/lib/abstract_unit.rb
index f5feb8d..41b92e0 100644
--- a/test/lib/abstract_unit.rb
+++ b/test/lib/abstract_unit.rb
@@ -8,12 +8,6 @@
 require 'action_view'
 require 'action_view/testing/resolvers'
 
-module Rails
-  def self.env
-    ActiveSupport::StringInquirer.new("test")
-  end
-end
-
 require 'prototype-rails/on_load_action_controller'
 require 'prototype-rails/on_load_action_view'