0
@@ -337,10 +337,10 @@ namespace :db do
0
       end
0
     end
0
 
0
-    desc 'Prepare the test database and load the schema'
0
-    task :prepare => %w(environment db:abort_if_pending_migrations) do
0
+    desc 'Check for pending migrations and load the test schema'
0
+    task :prepare => 'db:abort_if_pending_migrations' do
0
       if defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
0
-        Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:clone" }[ActiveRecord::Base.schema_format]].invoke
0
+        Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:schema:load" }[ActiveRecord::Base.schema_format]].invoke
0
       end
0
     end
0
   end