diff --git a/spec/support/postgres.rb b/spec/support/postgres.rb
index ef56a25e..de0abf08 100644
--- a/spec/support/postgres.rb
+++ b/spec/support/postgres.rb
@@ -18,11 +18,11 @@
     }
 
     db_prefix = POSTGRES_BASE_URI.path.sub(%r{^/}, "")
-    psql_list, _status = Open3.capture2(cmd_env, "psql -t -A -c '\\l #{db_prefix}*'")
+    psql_list, _status = Open3.capture2(cmd_env, "psql -t -X -A -c '\\l #{db_prefix}*'")
 
     test_databases = psql_list.split("\n").map { _1.split("|").first }
     test_databases.each do |database|
-      system(cmd_env, "dropdb --force #{database}")
+      system(cmd_env, "dropdb --force #{database}", exception: true)
     end
   end
 end