diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocQueryFiltersQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocQueryFiltersQueryNpgsqlTest.cs
index c17d4c5a6..dfb87cf05 100644
--- a/test/EFCore.PG.FunctionalTests/Query/AdHocQueryFiltersQueryNpgsqlTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/AdHocQueryFiltersQueryNpgsqlTest.cs
@@ -9,10 +9,6 @@ protected override ITestStoreFactory TestStoreFactory
     [ConditionalTheory, MemberData(nameof(IsAsyncData))]
     public virtual async Task Row_value_projection_over_filtered_navigation(bool async)
     {
-#pragma warning disable CS0618 // Type or member is obsolete
-        NpgsqlConnection.GlobalTypeMapper.EnableRecordsAsTuples();
-#pragma warning restore CS0618 // Type or member is obsolete
-
         var contextFactory = await InitializeAsync<Context3933>(
             seed: async context =>
             {
@@ -33,7 +29,9 @@ public virtual async Task Row_value_projection_over_filtered_navigation(bool asy
                     ]
                 });
                 await context.SaveChangesAsync();
-            });
+            },
+            onConfiguring: options => options.UseNpgsql(
+                NpgsqlTestStore.CreateConnectionString(StoreName), o => o.ConfigureDataSource(b => b.EnableRecordsAsTuples())));
 
         await using var context = contextFactory.CreateContext();