diff --git a/lib/spring/test/acceptance_test.rb b/lib/spring/test/acceptance_test.rb
index a8f293e6..53e58223 100644
--- a/lib/spring/test/acceptance_test.rb
+++ b/lib/spring/test/acceptance_test.rb
@@ -34,8 +34,8 @@ def spring_env
 
       def assert_output(artifacts, expected)
         expected.each do |stream, output|
-          assert artifacts[stream].include?(output),
-                 "expected #{stream} to include '#{output}'.\n\n#{app.debug(artifacts)}"
+          assert_match output, artifacts[stream],
+            "expected #{stream} to include #{output.inspect}.\n\n#{app.debug(artifacts)}"
         end
       end
 
@@ -230,7 +230,7 @@ def exec_name
       end
 
       test "binstub" do
-        assert_success "bin/rails server --help", stdout: "Usage: rails server" # rails command fallback
+        assert_success "bin/rails server --help", stdout: /Usage:\s+rails server/ # rails command fallback
 
         assert_success "#{app.spring} binstub rake", stdout: "bin/rake: spring already present"
 
diff --git a/lib/spring/test/application_generator.rb b/lib/spring/test/application_generator.rb
index 5f698de1..7a5ac70e 100644
--- a/lib/spring/test/application_generator.rb
+++ b/lib/spring/test/application_generator.rb
@@ -133,7 +133,7 @@ def copy_to(path)
 
       def generate_scaffold
         application.run! "bundle exec rails g scaffold post title:string"
-        application.run! "bundle exec rake db:migrate db:test:clone"
+        application.run! "bundle exec rake db:migrate db:test:prepare"
       end
 
       def gemspec(name)