Try to fix testing failures for PostgreSQL