diff --git a/lib/apartment/adapters/postgresql_adapter.rb b/lib/apartment/adapters/postgresql_adapter.rb
index 0458faff..2e29fcd0 100644
--- a/lib/apartment/adapters/postgresql_adapter.rb
+++ b/lib/apartment/adapters/postgresql_adapter.rb
@@ -119,7 +119,8 @@ class PostgresqlSchemaFromSqlAdapter < PostgresqlSchemaAdapter
 
       PSQL_DUMP_BLACKLISTED_STATEMENTS= [
         /SET search_path/i,   # overridden later
-        /SET lock_timeout/i   # new in postgresql 9.3
+        /SET lock_timeout/i,  # new in postgresql 9.3
+        /CREATE SCHEMA/i      # remove create schema clause
       ]
 
       def import_database_schema
@@ -175,13 +176,31 @@ def pg_dump_schema_migrations_data
       def patch_search_path(sql)
         search_path = "SET search_path = \"#{current}\", #{default_tenant};"
 
+        excluded_tables = Apartment.excluded_models.map{ |model| model.constantize.table_name }.uniq
         sql
           .split("\n")
+          .map { |line| format_foreign_key_constraints(line, excluded_tables) }
           .select {|line| check_input_against_regexps(line, PSQL_DUMP_BLACKLISTED_STATEMENTS).empty?}
           .prepend(search_path)
           .join("\n")
       end
 
+      # Append default_schema to FK definitions, for tables belonging to excluded_models
+      #
+      def format_foreign_key_constraints line, excluded_tables
+        if line.match(/ADD CONSTRAINT .* FOREIGN KEY/)
+          table_name = line[/REFERENCES (.*)\(/, 1]
+          new_table_name = "#{default_schema}.#{table_name}"
+          if excluded_tables.include?(new_table_name)
+            line.gsub("REFERENCES #{table_name}", "REFERENCES #{new_table_name}")
+          else
+            line
+          end
+        else
+          line
+        end
+      end
+
       #   Checks if any of regexps matches against input
       #
       def check_input_against_regexps(input, regexps)