diff --git a/lib/suspenders/app_builder.rb b/lib/suspenders/app_builder.rb
index f84ddd0ac..e60f06bb5 100644
--- a/lib/suspenders/app_builder.rb
+++ b/lib/suspenders/app_builder.rb
@@ -134,6 +134,11 @@ def configure_rspec
       copy_file 'spec_helper.rb', 'spec/spec_helper.rb'
     end
 
+    def use_rspec_binstub
+      run 'bundle binstub rspec-core'
+      run 'rm bin/autospec'
+    end
+
     def configure_background_jobs_for_rspec
       copy_file 'background_jobs_rspec.rb', 'spec/support/background_jobs.rb'
       run 'rails g delayed_job:active_record'
diff --git a/lib/suspenders/generators/app_generator.rb b/lib/suspenders/generators/app_generator.rb
index fa273d1b3..950d1ab28 100644
--- a/lib/suspenders/generators/app_generator.rb
+++ b/lib/suspenders/generators/app_generator.rb
@@ -49,7 +49,7 @@ def remove_files_we_dont_need
     def customize_gemfile
       build :replace_gemfile
       build :set_ruby_to_version_being_used
-      bundle_command 'install --binstubs=bin/stubs'
+      bundle_command 'install'
     end
 
     def setup_database
@@ -76,6 +76,7 @@ def setup_test_environment
       build :test_factories_first
       build :generate_rspec
       build :configure_rspec
+      build :use_rspec_binstub
       build :configure_background_jobs_for_rspec
       build :enable_database_cleaner
       build :configure_capybara_webkit
diff --git a/templates/suspenders_gitignore b/templates/suspenders_gitignore
index f413d0f6a..ca16006f6 100644
--- a/templates/suspenders_gitignore
+++ b/templates/suspenders_gitignore
@@ -4,7 +4,6 @@
 *.swp
 .bundle
 .sass-cache/
-bin/stubs
 coverage/*
 db/*.sqlite3
 db/schema.rb