diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 7bff2d029..97fa34288 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -12,7 +12,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  if Rails.env.test? || !ActiveRecord::Base.connection.table_exists?("settings")
+  if Rails.env.test? || !ActiveRecord::Base.connection.data_source_exists?("settings")
     config.mailer_sender = "noreply@consul.dev"
   else
     config.mailer_sender = "'#{Setting["mailer_from_name"]}' <#{Setting["mailer_from_address"]}>"
diff --git a/db/migrate/20150822095305_create_verified_users.rb b/db/migrate/20150822095305_create_verified_users.rb
index bb0c54042..457ba6b89 100644
--- a/db/migrate/20150822095305_create_verified_users.rb
+++ b/db/migrate/20150822095305_create_verified_users.rb
@@ -1,6 +1,6 @@
 class CreateVerifiedUsers < ActiveRecord::Migration
   def change
-    unless ActiveRecord::Base.connection.table_exists? 'verified_users'
+    unless ActiveRecord::Base.connection.data_source_exists?("verified_users")
       create_table :verified_users do |t|
         t.string :document_number
         t.string :document_type