diff --git a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveFailureRecoveryTest.java b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveFailureRecoveryTest.java
index e9f2660bc446..0facd0d56c75 100644
--- a/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveFailureRecoveryTest.java
+++ b/plugin/trino-hive/src/test/java/io/trino/plugin/hive/BaseHiveFailureRecoveryTest.java
@@ -156,14 +156,4 @@ public void testDeletePartitionWithSubquery()
                     Optional.of("DROP TABLE <table>"));
         }).hasMessageContaining("Deletes must match whole partitions for non-transactional tables");
     }
-
-    @Override
-    protected Session enableDynamicFiltering(boolean enabled)
-    {
-        Session session = super.enableDynamicFiltering(enabled);
-        return Session.builder(session)
-                // Ensure probe side scan wait until DF is collected
-                .setCatalogSessionProperty(session.getCatalog().orElseThrow(), "dynamic_filtering_wait_timeout", "1h")
-                .build();
-    }
 }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergFailureRecoveryTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergFailureRecoveryTest.java
index ae44be3daafb..e0b9699985e7 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergFailureRecoveryTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergFailureRecoveryTest.java
@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.iceberg;
 
-import io.trino.Session;
 import io.trino.operator.RetryPolicy;
 import io.trino.spi.ErrorType;
 import io.trino.testing.BaseFailureRecoveryTest;
@@ -258,14 +257,4 @@ public void testInsertIntoExistingPartition()
                 "INSERT INTO <table> SELECT *, 'partition1' p FROM orders",
                 Optional.of("DROP TABLE <table>"));
     }
-
-    @Override
-    protected Session enableDynamicFiltering(boolean enabled)
-    {
-        Session session = super.enableDynamicFiltering(enabled);
-        return Session.builder(session)
-                // Ensure probe side scan wait until DF is collected
-                .setCatalogSessionProperty(session.getCatalog().orElseThrow(), "dynamic_filtering_wait_timeout", "1h")
-                .build();
-    }
 }
diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
index a8d180c3b27b..4693e34a2407 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseFailureRecoveryTest.java
@@ -814,13 +814,15 @@ private static StageStats getRootStage(MaterializedResult result)
         return requireNonNull(statementStats.getRootStage(), "root stage is null");
     }
 
-    protected Session enableDynamicFiltering(boolean enabled)
+    private Session enableDynamicFiltering(boolean enabled)
     {
         Session defaultSession = getQueryRunner().getDefaultSession();
         return Session.builder(defaultSession)
                 .setSystemProperty(ENABLE_DYNAMIC_FILTERING, Boolean.toString(enabled))
                 .setSystemProperty(JOIN_REORDERING_STRATEGY, NONE.name())
                 .setSystemProperty(JOIN_DISTRIBUTION_TYPE, PARTITIONED.name())
+                // Ensure probe side scan wait until DF is collected
+                .setCatalogSessionProperty(defaultSession.getCatalog().orElseThrow(), "dynamic_filtering_wait_timeout", "1h")
                 .build();
     }
 }