5 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/generators/rails/integration_test/integration_test_generator.rb b/railties/lib/generators/rails/integration_test/integration_test_generator.rb
index a958350019..00afaf70ab 100644
--- a/railties/lib/generators/rails/integration_test/integration_test_generator.rb
+++ b/railties/lib/generators/rails/integration_test/integration_test_generator.rb
@@ -2,7 +2,7 @@ module Rails
   module Generators
     class IntegrationTestGenerator < NamedBase
       def check_class_collisions
-        class_collisions class_name, "#{class_name}Test"
+        class_collisions "#{class_name}Test"
       end
 
       def create_test_files
diff --git a/railties/lib/generators/rails/performance_test/performance_test_generator.rb b/railties/lib/generators/rails/performance_test/performance_test_generator.rb
index 8e2537c2b3..bf83b354a8 100644
--- a/railties/lib/generators/rails/performance_test/performance_test_generator.rb
+++ b/railties/lib/generators/rails/performance_test/performance_test_generator.rb
@@ -2,7 +2,7 @@ module Rails
   module Generators
     class PerformanceTestGenerator < NamedBase
       def check_class_collisions
-        class_collisions class_name, "#{class_name}Test"
+        class_collisions "#{class_name}Test"
       end
 
       def create_test_files
diff --git a/railties/lib/generators/test_unit/helper/helper_generator.rb b/railties/lib/generators/test_unit/helper/helper_generator.rb
index e7fc4e0dbd..9d888929d0 100644
--- a/railties/lib/generators/test_unit/helper/helper_generator.rb
+++ b/railties/lib/generators/test_unit/helper/helper_generator.rb
@@ -2,7 +2,7 @@ module TestUnit
   module Generators
     class HelperGenerator < Base
       def check_class_collisions
-        class_collisions "#{class_name}Helper"
+        class_collisions "#{class_name}HelperTest"
       end
 
       def create_helper_files
diff --git a/railties/lib/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/generators/test_unit/mailer/mailer_generator.rb
index 9249e9bd51..5a4499d92c 100644
--- a/railties/lib/generators/test_unit/mailer/mailer_generator.rb
+++ b/railties/lib/generators/test_unit/mailer/mailer_generator.rb
@@ -4,7 +4,7 @@ module TestUnit
       argument :actions, :type => :array, :default => [], :banner => "method method"
 
       def check_class_collisions
-        class_collisions class_name, "#{class_name}Test"
+        class_collisions "#{class_name}Test"
       end
 
       def create_test_files
diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb
index 506889e4a7..56e66a7c41 100644
--- a/railties/test/generators/helper_generator_test.rb
+++ b/railties/test/generators/helper_generator_test.rb
@@ -14,7 +14,7 @@ class HelperGeneratorTest < GeneratorsTestCase
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/unit/helpers/admin_helper_test.rb"
+    assert_file "test/unit/helpers/admin_helper_test.rb", /class AdminHelperTest < ActionView::TestCase/
   end
 
   def test_logs_if_the_test_framework_cannot_be_found