diff --git a/lib/backup_restore/database_restorer.rb b/lib/backup_restore/database_restorer.rb
index 100a366cd9e..ae3ac7deaa4 100644
--- a/lib/backup_restore/database_restorer.rb
+++ b/lib/backup_restore/database_restorer.rb
@@ -51,6 +51,11 @@ module BackupRestore
       end
     end
 
+    def self.core_migration_files
+      Dir[Rails.root.join(Migration::SafeMigrate.post_migration_path, "**/*.rb")] +
+        Dir[Rails.root.join("db/migrate/*.rb")]
+    end
+
     protected
 
     def restore_dump
@@ -154,7 +159,7 @@ module BackupRestore
       @created_functions_for_table_columns = []
       all_readonly_table_columns = []
 
-      Dir[Rails.root.join(Migration::SafeMigrate.post_migration_path, "**/*.rb")].each do |path|
+      DatabaseRestorer.core_migration_files.each do |path|
         require path
         class_name = File.basename(path, ".rb").sub(/^\d+_/, "").camelize
         migration_class = class_name.constantize
diff --git a/spec/lib/backup_restore/database_restorer_spec.rb b/spec/lib/backup_restore/database_restorer_spec.rb
index 351406e1e30..fbe6204609a 100644
--- a/spec/lib/backup_restore/database_restorer_spec.rb
+++ b/spec/lib/backup_restore/database_restorer_spec.rb
@@ -200,7 +200,9 @@ describe BackupRestore::DatabaseRestorer do
 
   context "readonly functions" do
     before do
-      Migration::SafeMigrate.stubs(:post_migration_path).returns("spec/fixtures/db/post_migrate/drop_column")
+      BackupRestore::DatabaseRestorer.stubs(:core_migration_files).returns(
+        Dir[Rails.root.join("spec/fixtures/db/post_migrate/drop_column/**/*.rb")]
+      )
     end
 
     it "doesn't try to drop function when no functions have been created" do