2 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/test/template/erb/form_for_test.rb b/actionpack/test/template/erb/form_for_test.rb
index e722b40a9a..02f07496e0 100644
--- a/actionpack/test/template/erb/form_for_test.rb
+++ b/actionpack/test/template/erb/form_for_test.rb
@@ -1,10 +1,11 @@
 require "abstract_unit"
 require "template/erb/helper"
+require "controller/fake_models"
 
 module ERBTest
   class TagHelperTest < BlockTestCase
     test "form_for works" do
-      output = render_content "form_for(:staticpage, :url => {:controller => 'blah', :action => 'update'})", ""
+      output = render_content "form_for(Post.new, :url => {:controller => 'blah', :action => 'update'})", ""
       assert_match %r{<form.*action="/blah/update".*method="post">.*</form>}, output
     end
   end
diff --git a/actionpack/test/template/erb/helper.rb b/actionpack/test/template/erb/helper.rb
index 799f9e4036..fb9d0315f3 100644
--- a/actionpack/test/template/erb/helper.rb
+++ b/actionpack/test/template/erb/helper.rb
@@ -4,6 +4,8 @@ module ERBTest
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::JavaScriptHelper
     include ActionView::Helpers::FormHelper
+    include ActionView::Context
+    include ActionController::RecordIdentifier
 
     attr_accessor :output_buffer, :controller
 
@@ -20,4 +22,4 @@ module ERBTest
       "<%= #{str} do %>#{rest}<% end %>"
     end
   end
-end
-\ No newline at end of file
+end