1 files changed, 8 insertions, 10 deletions
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 9cd3b6e2f9..d45ea08a6f 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -2,10 +2,8 @@ require 'abstract_unit'
 
 RequestMock = Struct.new("Request", :request_uri, :protocol, :host_with_port, :env)
 
-class UrlHelperTest < Test::Unit::TestCase
-  include ActionView::Helpers::AssetTagHelper
-  include ActionView::Helpers::UrlHelper
-  include ActionView::Helpers::TagHelper
+class UrlHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::UrlHelper
 
   def setup
     @controller = Class.new do
@@ -293,7 +291,7 @@ class UrlHelperTest < Test::Unit::TestCase
   end
 end
 
-class UrlHelperWithControllerTest < Test::Unit::TestCase
+class UrlHelperWithControllerTest < ActionView::TestCase
   class UrlHelperController < ActionController::Base
     self.view_paths = [ "#{File.dirname(__FILE__)}/../fixtures/" ]
 
@@ -310,7 +308,7 @@ class UrlHelperWithControllerTest < Test::Unit::TestCase
     def rescue_action(e) raise e end
   end
 
-  include ActionView::Helpers::UrlHelper
+  tests ActionView::Helpers::UrlHelper
 
   def setup
     @request    = ActionController::TestRequest.new
@@ -348,7 +346,7 @@ class UrlHelperWithControllerTest < Test::Unit::TestCase
     end
 end
 
-class LinkToUnlessCurrentWithControllerTest < Test::Unit::TestCase
+class LinkToUnlessCurrentWithControllerTest < ActionView::TestCase
   class TasksController < ActionController::Base
     self.view_paths = ["#{File.dirname(__FILE__)}/../fixtures/"]
 
@@ -372,7 +370,7 @@ class LinkToUnlessCurrentWithControllerTest < Test::Unit::TestCase
       end
   end
 
-  include ActionView::Helpers::UrlHelper
+  tests ActionView::Helpers::UrlHelper
 
   def setup
     @request    = ActionController::TestRequest.new
@@ -440,7 +438,7 @@ class Session
   end
 end
 
-class PolymorphicControllerTest < Test::Unit::TestCase
+class PolymorphicControllerTest < ActionView::TestCase
   class WorkshopsController < ActionController::Base
     self.view_paths = ["#{File.dirname(__FILE__)}/../fixtures/"]
 
@@ -479,7 +477,7 @@ class PolymorphicControllerTest < Test::Unit::TestCase
     def rescue_action(e) raise e end
   end
 
-  include ActionView::Helpers::UrlHelper
+  tests ActionView::Helpers::UrlHelper
 
   def setup
     @request    = ActionController::TestRequest.new