diff --git a/features/remote.feature b/features/remote.feature
index 06a424d..df45a6b 100644
--- a/features/remote.feature
+++ b/features/remote.feature
@@ -15,7 +15,7 @@ Feature: heroku_san can control a project on Heroku
     Given I have a new Rails project
     When I am in the project directory
     And I commit any changes with "Initial commit"
-    And I add heroku_san to the Gemfile
+    And I add heroku_san to the rails Gemfile
     And I run bundle install
     And I generate a new config file
     And I create my project on Heroku
@@ -35,7 +35,7 @@ Feature: heroku_san can control a project on Heroku
     Given I have a new Sinatra project
     When I am in the project directory
     And I commit any changes with "Initial commit"
-    And I add heroku_san to the Gemfile
+    And I add heroku_san to the sinatra Gemfile
     And I run bundle install
     And I create a new config/heroku.yml file
     And I create my project on Heroku
diff --git a/features/step_definitions/remote_steps.rb b/features/step_definitions/remote_steps.rb
index 9d3fcd2..8d0904c 100644
--- a/features/step_definitions/remote_steps.rb
+++ b/features/step_definitions/remote_steps.rb
@@ -3,7 +3,7 @@
 require 'godot'
 
 Given /^I have a new Rails project$/ do
-  cmd = "rails new test_app --quiet --force --skip-active-record --skip-bundle --skip-javascript --skip-test-unit --skip-sprockets"
+  cmd = "rails new test_app --quiet --force --skip-bundle --skip-javascript --skip-test-unit --skip-sprockets"
   run_clean unescape(cmd)
 end
 
@@ -51,8 +51,24 @@
   run_clean "git tag -a '#{tag}' -m '#{annotation}' HEAD"
 end
 
-When /^I add heroku_san to the Gemfile$/ do
-  append_to_file 'Gemfile', <<EOT.strip_heredoc
+When /^I add heroku_san to the rails Gemfile$/ do
+  overwrite_file 'Gemfile', <<EOT.strip_heredoc
+    source 'https://rubygems.org'
+    ruby '1.9.3'
+    gem 'rails', '3.2.7'
+    gem 'pg'
+    group :development, :test do
+      gem 'heroku_san', :path => '../../../.'
+      gem 'sqlite3'
+    end
+EOT
+end
+
+When /^I add heroku_san to the sinatra Gemfile$/ do
+  overwrite_file 'Gemfile', <<EOT.strip_heredoc
+    source 'https://rubygems.org'
+    ruby '1.9.3'
+    gem 'sinatra'
     group :development, :test do
       gem 'heroku_san', :path => '../../../.'
     end
@@ -142,7 +158,7 @@ def run_clean(cmd)
 end
 
 When /^I generate a scaffold$/ do
-  run_clean 'rails generate scaffold droid'
+  run_clean 'rails generate resource droid'
   append_to_file 'app/views/droids/index.html.erb', %Q{\n<div><code><%= ENV['DROIDS'] -%></code></div>\n}
 end
 
@@ -181,15 +197,13 @@ def run_clean(cmd)
     test_app:
       app: #{@app}
       addons:
-        - deployhooks:campfire
+        - scheduler:standard
 
 END_CONFIG
 
   output = run_clean 'rake test_app heroku:addons'
   # The output should show the new one ...
-  assert_partial_output "deployhooks:campfire", output
-  # ... with a note about needing to configure it.
-  assert_partial_output "https://api.heroku.com/myapps/#{@app}/addons/deployhooks:campfire", output
+  assert_partial_output "scheduler:standard", output
 end
 
 Then /^(?:heroku_san|issue \d+) (?:is green|has been fixed)$/ do