From b10634f5f68e4a65708a0ce13fc0dd95a875bc4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Herrera?= <alvherre@kurilemu.de>
Date: Tue, 25 Nov 2025 13:56:49 +0100
Subject: [PATCH 2/3] log_statement=off

---
 src/bin/pg_amcheck/t/003_check.pl            | 5 ++++-
 src/bin/pg_dump/t/002_pg_dump.pl             | 3 +++
 src/bin/pgbench/t/001_pgbench_with_server.pl | 4 ++++
 src/test/recovery/t/027_stream_regress.pl    | 1 +
 src/test/subscription/t/035_conflicts.pl     | 3 +++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/bin/pg_amcheck/t/003_check.pl b/src/bin/pg_amcheck/t/003_check.pl
index 881854da254..63de75adf4f 100644
--- a/src/bin/pg_amcheck/t/003_check.pl
+++ b/src/bin/pg_amcheck/t/003_check.pl
@@ -121,7 +121,10 @@ sub perform_all_corruptions()
 # Test set-up
 $node = PostgreSQL::Test::Cluster->new('test');
 $node->init(no_data_checksums => 1);
-$node->append_conf('postgresql.conf', 'autovacuum=off');
+$node->append_conf('postgresql.conf',
+	qq{autovacuum=off
+log_statement=none
+});
 $node->start;
 $port = $node->port;
 
diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
index a05212719d9..db3fe1aa068 100644
--- a/src/bin/pg_dump/t/002_pg_dump.pl
+++ b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -4839,6 +4839,9 @@ my %tests = (
 
 my $node = PostgreSQL::Test::Cluster->new('main');
 $node->init;
+$node->append_conf(
+	'postgresql.conf',
+	qq{log_statement=none});
 $node->start;
 
 my $port = $node->port;
diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
index 581e9af7907..83b929642ec 100644
--- a/src/bin/pgbench/t/001_pgbench_with_server.pl
+++ b/src/bin/pgbench/t/001_pgbench_with_server.pl
@@ -42,6 +42,10 @@ my $node = PostgreSQL::Test::Cluster->new('main');
 # Set to untranslated messages, to be able to compare program output with
 # expected strings.
 $node->init(extra => [ '--locale', 'C' ]);
+$node->append_conf(
+	'postgresql.conf',
+	qq{log_statement=none});
+
 $node->start;
 
 # tablespace for testing, because partitioned tables cannot use pg_default
diff --git a/src/test/recovery/t/027_stream_regress.pl b/src/test/recovery/t/027_stream_regress.pl
index 589c79d97d3..64b15f276e2 100644
--- a/src/test/recovery/t/027_stream_regress.pl
+++ b/src/test/recovery/t/027_stream_regress.pl
@@ -26,6 +26,7 @@ $node_primary->append_conf(
 	qq{shared_preload_libraries = 'pg_stat_statements'
 pg_stat_statements.max = 50000
 compute_query_id = 'regress'
+log_statement=none
 });
 
 # We'll stick with Cluster->new's small default shared_buffers, but since that
diff --git a/src/test/subscription/t/035_conflicts.pl b/src/test/subscription/t/035_conflicts.pl
index a94bde16f53..3ad6af2908e 100644
--- a/src/test/subscription/t/035_conflicts.pl
+++ b/src/test/subscription/t/035_conflicts.pl
@@ -14,6 +14,9 @@ use Test::More;
 # Create a publisher node
 my $node_publisher = PostgreSQL::Test::Cluster->new('publisher');
 $node_publisher->init(allows_streaming => 'logical');
+$node_publisher->append_conf(
+	'postgresql.conf',
+	qq{log_statements=none});
 $node_publisher->start;
 
 # Create a subscriber node
-- 
2.47.3