diff --git a/Changelog.md b/Changelog.md
index 7410738d9b..b0470a8012 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,8 @@ Enhancements:
 
 * Issue a warning when using job matchers with `#at` mis-match on `usec` precision.
   (Jon Rowe, #2350)
+* Generate request specs with consistent file naming, without `request_spec` suffix.
+  (Eloy Espinaco, #2355)
 
 Bug Fixes:
 
diff --git a/example_app_generator/generate_stuff.rb b/example_app_generator/generate_stuff.rb
index 581bb9ca78..b0d905c48f 100644
--- a/example_app_generator/generate_stuff.rb
+++ b/example_app_generator/generate_stuff.rb
@@ -84,8 +84,12 @@ def using_source_path(path)
 generate('rspec:install')
 generate('controller wombats index') # plural
 generate('controller welcome index') # singular
-generate('rspec:request wombats')
-generate('integration_test widgets')
+# Generate controllers so that Rails generates routes
+generate('controller logins index --no-request_specs --no-view_specs --no-helper_specs')
+generate('controller signups index --no-request_specs --no-view_specs --no-helper_specs')
+# The generated specs from IntegrationGenerator rely on index routes being present
+generate('rspec:request logins')
+generate('integration_test signups')
 generate('mailer Notifications signup')
 
 generate('model thing name:string')
diff --git a/lib/generators/rspec/controller/controller_generator.rb b/lib/generators/rspec/controller/controller_generator.rb
index 58c7f3db64..c03ae83184 100644
--- a/lib/generators/rspec/controller/controller_generator.rb
+++ b/lib/generators/rspec/controller/controller_generator.rb
@@ -16,7 +16,7 @@ def generate_request_spec
         return unless options[:request_specs]
 
         template 'request_spec.rb',
-                 File.join('spec/requests', class_path, "#{file_name}_request_spec.rb")
+                 File.join('spec/requests', class_path, "#{file_name}_spec.rb")
       end
 
       def generate_controller_spec
diff --git a/spec/generators/rspec/controller/controller_generator_spec.rb b/spec/generators/rspec/controller/controller_generator_spec.rb
index 256be0be78..8516703f23 100644
--- a/spec/generators/rspec/controller/controller_generator_spec.rb
+++ b/spec/generators/rspec/controller/controller_generator_spec.rb
@@ -6,7 +6,7 @@
   setup_default_destination
 
   describe 'request specs' do
-    subject { file('spec/requests/posts_request_spec.rb') }
+    subject { file('spec/requests/posts_spec.rb') }
 
     describe 'generated by default' do
       before do
@@ -38,7 +38,7 @@
     end
 
     describe 'with namespace and actions' do
-      subject { file('spec/requests/admin/external/users_request_spec.rb') }
+      subject { file('spec/requests/admin/external/users_spec.rb') }
 
       before do
         run_generator %w[admin::external::users index custom_action]