diff --git a/lib/tasks/db_enhancements.rake b/lib/tasks/db_enhancements.rake
index 5fddb6cde..61b8c0e95 100644
--- a/lib/tasks/db_enhancements.rake
+++ b/lib/tasks/db_enhancements.rake
@@ -20,12 +20,18 @@ db_namespace = namespace :db do
       unless ActiveRecord::Base.connection.table_exists? 'ar_internal_metadata'
         db_namespace['load_config'].invoke if ActiveRecord.schema_format == :ruby
         ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:ruby, ENV.fetch('SCHEMA', nil))
-        db_namespace['seed'].invoke
+        db_namespace['seed'].invoke unless Rails.env.test?
       end
 
       db_namespace['migrate'].invoke
     rescue ActiveRecord::NoDatabaseError
-      db_namespace['setup'].invoke
+      if Rails.env.test?
+        db_namespace['create'].invoke
+        db_namespace['load_config'].invoke if ActiveRecord.schema_format == :ruby
+        ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:ruby, ENV.fetch('SCHEMA', nil))
+      else
+        db_namespace['setup'].invoke
+      end
     end
   end
 end