diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
index d51c1c351a..bc49120749 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
@@ -19,7 +19,7 @@ public final class QueryPlanLoggerPostgres extends QueryPlanLogger {
 
   @Override
   public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) {
-    String explain = "explain analyze " + plan.sql();
+    String explain = "explain (analyze, buffers) " + plan.sql();
     try (PreparedStatement explainStmt = conn.prepareStatement(explain)) {
       bind.prepare(explainStmt, conn);
       try (ResultSet rset = explainStmt.executeQuery()) {
diff --git a/ebean-test/src/test/java/main/StartPostgres.java b/ebean-test/src/test/java/main/StartPostgres.java
index 0356ff25c0..353afc5ac4 100644
--- a/ebean-test/src/test/java/main/StartPostgres.java
+++ b/ebean-test/src/test/java/main/StartPostgres.java
@@ -5,7 +5,7 @@
 public class StartPostgres {
 
   public static void main(String[] args) {
-    PostgresContainer.builder("14")
+    PostgresContainer.builder("15")
       .dbName("unit")
       //.port(6432)
       //.user("unit")