diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index bec5b9164acda307e1991eda921d934c9048466f..f223730a017be61abaeaf44fa4d702d7a411caf7 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed that mailer generator generated fixtures/plural while units expected fixtures/singular #1457 [Scott Barron]
+
 * Added a 'whiny nil' that's aim to ensure that when users pass nil to methods where that isn't appropriate, instead of NoMethodError? and the name of some method used by the framework users will see a message explaining what type of object was expected. Only active in test and development environments by default #1209 [Michael Koziarski]
 
 * Fixed the test_helper.rb to be safe for requiring controllers from multiple spots, like app/controllers/article_controller.rb and app/controllers/admin/article_controller.rb, without reloading the environment twice #1390 [Nicholas Seckar]
diff --git a/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb b/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb
index ffa321fb87df1b04ee8ea46cf62844d7d79fd8a1..bac0cb017526cbfdb6998a3a7fa1c864d05bcb4a 100644
--- a/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb
+++ b/railties/lib/rails_generator/generators/components/mailer/mailer_generator.rb
@@ -8,7 +8,7 @@ def manifest
       m.directory File.join('app/models', class_path)
       m.directory File.join('app/views', class_path, file_name)
       m.directory File.join('test/unit', class_path)
-      m.directory File.join('test/fixtures', class_path, table_name)
+      m.directory File.join('test/fixtures', class_path, file_name)
 
       # Mailer class and unit test.
       m.template "mailer.rb",    File.join('app/models',
@@ -24,7 +24,7 @@ def manifest
                    File.join('app/views', class_path, file_name, "#{action}.rhtml"),
                    :assigns => { :action => action }
         m.template "fixture.rhtml",
-                   File.join('test/fixtures', class_path, table_name, action),
+                   File.join('test/fixtures', class_path, file_name, action),
                    :assigns => { :action => action }
       end
     end