diff --git a/actionpack/test/action_view_test.rb b/actionpack/test/action_view_test.rb
deleted file mode 100644
index fb27fbfec4..0000000000
--- a/actionpack/test/action_view_test.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'abstract_unit'
-
-class ActionViewTests < Test::Unit::TestCase
-  def test_find_template_extension_from_first_render
-    base = ActionView::Base.new
-
-    assert_nil base.send(:find_template_extension_from_first_render)
-
-    {
-      nil => nil,
-      '' => nil,
-      'foo' => nil,
-      '/foo' => nil,
-      'foo.rb' => 'rb',
-      'foo.bar.rb' => 'bar.rb',
-      'baz/foo.rb' => 'rb',
-      'baz/foo.bar.rb' => 'bar.rb',
-      'baz/foo.o/foo.rb' => 'rb',
-      'baz/foo.o/foo.bar.rb' => 'bar.rb',
-    }.each do |input,expectation|
-      base.instance_variable_set('@first_render', input)
-      assert_equal expectation, base.send(:find_template_extension_from_first_render)
-    end
-  end
-  
-  def test_should_report_file_exists_correctly
-    base = ActionView::Base.new
-
-    assert_nil base.send(:find_template_extension_from_first_render)
-    
-    assert_equal false, base.send(:file_exists?, 'test.rhtml')
-    assert_equal false, base.send(:file_exists?, 'test.rb')
-
-    base.instance_variable_set('@first_render', 'foo.rb')
-    
-    assert_equal 'rb', base.send(:find_template_extension_from_first_render)
-    
-    assert_equal false, base.send(:file_exists?, 'baz')
-    assert_equal false, base.send(:file_exists?, 'baz.rb')
-
-  end
-  
-end
diff --git a/actionpack/test/template/template_finder_test.rb b/actionpack/test/template/template_finder_test.rb
index 2b9569f099..8640d22e02 100644
--- a/actionpack/test/template/template_finder_test.rb
+++ b/actionpack/test/template/template_finder_test.rb
@@ -30,7 +30,39 @@ class TemplateFinderTest < Test::Unit::TestCase
     assert_equal Dir.glob("#{LOAD_PATH_ROOT}/**/*").find_all {|f| !File.directory?(f) }.size,
                  ActionView::TemplateFinder.processed_view_paths[LOAD_PATH_ROOT].size
   end
+  
+  def test_find_template_extension_from_first_render    
+    assert_nil @finder.send(:find_template_extension_from_first_render)
 
+    {
+      nil => nil,
+      '' => nil,
+      'foo' => nil,
+      '/foo' => nil,
+      'foo.rb' => 'rb',
+      'foo.bar.rb' => 'bar.rb',
+      'baz/foo.rb' => 'rb',
+      'baz/foo.bar.rb' => 'bar.rb',
+      'baz/foo.o/foo.rb' => 'rb',
+      'baz/foo.o/foo.bar.rb' => 'bar.rb',
+    }.each do |input,expectation|
+      @template.instance_variable_set('@first_render', input)
+      assert_equal expectation, @finder.send(:find_template_extension_from_first_render)
+    end
+  end
+  
+  def test_should_report_file_exists_correctly
+    assert_nil @finder.send(:find_template_extension_from_first_render)    
+    assert_equal false, @finder.send(:file_exists?, 'test.rhtml')
+    assert_equal false, @finder.send(:file_exists?, 'test.rb')
+
+    @template.instance_variable_set('@first_render', 'foo.rb')
+    
+    assert_equal 'rb', @finder.send(:find_template_extension_from_first_render)    
+    assert_equal false, @finder.send(:file_exists?, 'baz')
+    assert_equal false, @finder.send(:file_exists?, 'baz.rb')
+  end
+  
   uses_mocha 'Template finder tests' do
 
     def test_should_update_extension_cache_when_template_handler_is_registered
@@ -39,5 +71,5 @@ class TemplateFinderTest < Test::Unit::TestCase
     end
 
   end
-
+  
 end