diff --git a/src/EFCore.PG/Query/Internal/NpgsqlQuerySqlGenerator.cs b/src/EFCore.PG/Query/Internal/NpgsqlQuerySqlGenerator.cs
index b971f79e1..b1c3d3072 100644
--- a/src/EFCore.PG/Query/Internal/NpgsqlQuerySqlGenerator.cs
+++ b/src/EFCore.PG/Query/Internal/NpgsqlQuerySqlGenerator.cs
@@ -399,20 +399,6 @@ protected override Expression VisitSqlUnary(SqlUnaryExpression sqlUnaryExpressio
                 Sql.Append("!!");
                 Visit(sqlUnaryExpression.Operand);
                 return sqlUnaryExpression;
-
-            // EF uses unary Equal and NotEqual to represent is-null checking.
-            // These need to be surrounded in parentheses in various cases (e.g. where TRUE = x IS NOT NULL
-            case ExpressionType.Equal:
-                Sql.Append("(");
-                Visit(sqlUnaryExpression.Operand);
-                Sql.Append(" IS NULL)");
-                return sqlUnaryExpression;
-
-            case ExpressionType.NotEqual:
-                Sql.Append("(");
-                Visit(sqlUnaryExpression.Operand);
-                Sql.Append(" IS NOT NULL)");
-                return sqlUnaryExpression;
             }
 
             return base.VisitSqlUnary(sqlUnaryExpression);
diff --git a/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs
index f07d4fc3a..fd84220b0 100644
--- a/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs
@@ -56,7 +56,7 @@ public override async Task Nullable_value_array_index_compare_to_null(bool async
             AssertSql(
                 @"SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""ValueConvertedScalar""
 FROM ""SomeEntities"" AS s
-WHERE (s.""NullableIntArray""[3] IS NULL)");
+WHERE s.""NullableIntArray""[3] IS NULL");
         }
 
         public override async Task Non_nullable_value_array_index_compare_to_null(bool async)
@@ -76,7 +76,7 @@ public override async Task Nullable_reference_array_index_compare_to_null(bool a
             AssertSql(
                 @"SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""ValueConvertedScalar""
 FROM ""SomeEntities"" AS s
-WHERE (s.""NullableStringArray""[3] IS NULL)");
+WHERE s.""NullableStringArray""[3] IS NULL");
         }
 
         public override async Task Non_nullable_reference_array_index_compare_to_null(bool async)
@@ -205,7 +205,7 @@ public override async Task Array_column_Contains_null_constant(bool async)
             AssertSql(
                 @"SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""ValueConvertedScalar""
 FROM ""SomeEntities"" AS s
-WHERE (array_position(s.""NullableStringArray"", NULL) IS NOT NULL)");
+WHERE array_position(s.""NullableStringArray"", NULL) IS NOT NULL");
         }
 
         public override void Array_column_Contains_null_parameter_does_not_work()
@@ -263,7 +263,7 @@ await AssertQuery(
 
 SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""ValueConvertedScalar""
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableText"" = ANY (@__array_0) OR ((s.""NullableText"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
+WHERE s.""NullableText"" = ANY (@__array_0) OR (s.""NullableText"" IS NULL AND array_position(@__array_0, NULL) IS NOT NULL)");
         }
 
         public override async Task Array_param_Contains_non_nullable_column(bool async)
@@ -312,7 +312,7 @@ public override void Array_param_with_null_Contains_non_nullable_not_found_negat
 
 SELECT COUNT(*)::INT
 FROM ""SomeEntities"" AS s
-WHERE NOT (s.""NonNullableText"" = ANY (@__array_0) AND ((s.""NonNullableText"" = ANY (@__array_0) IS NOT NULL)))");
+WHERE NOT (s.""NonNullableText"" = ANY (@__array_0) AND (s.""NonNullableText"" = ANY (@__array_0) IS NOT NULL))");
         }
 
         public override void Array_param_with_null_Contains_nullable_not_found()
@@ -328,7 +328,7 @@ public override void Array_param_with_null_Contains_nullable_not_found()
 
 SELECT COUNT(*)::INT
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableText"" = ANY (@__array_0) OR ((s.""NullableText"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
+WHERE s.""NullableText"" = ANY (@__array_0) OR (s.""NullableText"" IS NULL AND array_position(@__array_0, NULL) IS NOT NULL)");
         }
 
         public override void Array_param_with_null_Contains_nullable_not_found_negated()
@@ -344,7 +344,7 @@ public override void Array_param_with_null_Contains_nullable_not_found_negated()
 
 SELECT COUNT(*)::INT
 FROM ""SomeEntities"" AS s
-WHERE NOT (s.""NullableText"" = ANY (@__array_0) AND ((s.""NullableText"" = ANY (@__array_0) IS NOT NULL))) AND ((s.""NullableText"" IS NOT NULL) OR (array_position(@__array_0, NULL) IS NULL))");
+WHERE NOT (s.""NullableText"" = ANY (@__array_0) AND (s.""NullableText"" = ANY (@__array_0) IS NOT NULL)) AND (s.""NullableText"" IS NOT NULL OR array_position(@__array_0, NULL) IS NULL)");
         }
 
         public override async Task Byte_array_parameter_contains_column(bool async)
diff --git a/test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs
index 2e423be35..a25fdb508 100644
--- a/test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs
@@ -59,7 +59,7 @@ public override async Task Nullable_value_array_index_compare_to_null(bool async
             AssertSql(
                 @"SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""ValueConvertedScalar""
 FROM ""SomeEntities"" AS s
-WHERE (s.""NullableIntList""[3] IS NULL)");
+WHERE s.""NullableIntList""[3] IS NULL");
         }
 
         public override async Task Non_nullable_value_array_index_compare_to_null(bool async)
@@ -79,7 +79,7 @@ public override async Task Nullable_reference_array_index_compare_to_null(bool a
             AssertSql(
                 @"SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""ValueConvertedScalar""
 FROM ""SomeEntities"" AS s
-WHERE (s.""NullableStringList""[3] IS NULL)");
+WHERE s.""NullableStringList""[3] IS NULL");
         }
 
         public override async Task Non_nullable_reference_array_index_compare_to_null(bool async)
@@ -193,7 +193,7 @@ public override async Task Array_column_Contains_null_constant(bool async)
             AssertSql(
                 @"SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""ValueConvertedScalar""
 FROM ""SomeEntities"" AS s
-WHERE (array_position(s.""NullableStringList"", NULL) IS NOT NULL)");
+WHERE array_position(s.""NullableStringList"", NULL) IS NOT NULL");
         }
 
         public override void Array_column_Contains_null_parameter_does_not_work()
@@ -251,7 +251,7 @@ await AssertQuery(
 
 SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""ValueConvertedScalar""
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableText"" = ANY (@__array_0) OR ((s.""NullableText"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
+WHERE s.""NullableText"" = ANY (@__array_0) OR (s.""NullableText"" IS NULL AND array_position(@__array_0, NULL) IS NOT NULL)");
         }
 
         public override async Task Array_param_Contains_non_nullable_column(bool async)
@@ -310,7 +310,7 @@ public override void Array_param_with_null_Contains_non_nullable_not_found_negat
 
 SELECT COUNT(*)::INT
 FROM ""SomeEntities"" AS s
-WHERE NOT (s.""NonNullableText"" = ANY (@__array_0) AND ((s.""NonNullableText"" = ANY (@__array_0) IS NOT NULL)))");
+WHERE NOT (s.""NonNullableText"" = ANY (@__array_0) AND (s.""NonNullableText"" = ANY (@__array_0) IS NOT NULL))");
         }
 
         public override void Array_param_with_null_Contains_nullable_not_found()
@@ -331,7 +331,7 @@ public override void Array_param_with_null_Contains_nullable_not_found()
 
 SELECT COUNT(*)::INT
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableText"" = ANY (@__array_0) OR ((s.""NullableText"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
+WHERE s.""NullableText"" = ANY (@__array_0) OR (s.""NullableText"" IS NULL AND array_position(@__array_0, NULL) IS NOT NULL)");
         }
 
         public override void Array_param_with_null_Contains_nullable_not_found_negated()
@@ -352,7 +352,7 @@ public override void Array_param_with_null_Contains_nullable_not_found_negated()
 
 SELECT COUNT(*)::INT
 FROM ""SomeEntities"" AS s
-WHERE NOT (s.""NullableText"" = ANY (@__array_0) AND ((s.""NullableText"" = ANY (@__array_0) IS NOT NULL))) AND ((s.""NullableText"" IS NOT NULL) OR (array_position(@__array_0, NULL) IS NULL))");
+WHERE NOT (s.""NullableText"" = ANY (@__array_0) AND (s.""NullableText"" = ANY (@__array_0) IS NOT NULL)) AND (s.""NullableText"" IS NOT NULL OR array_position(@__array_0, NULL) IS NULL)");
         }
 
         public override async Task Byte_array_parameter_contains_column(bool async)
diff --git a/test/EFCore.PG.FunctionalTests/Query/CitextQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/CitextQueryTest.cs
index e7fc5b40d..8667874a7 100644
--- a/test/EFCore.PG.FunctionalTests/Query/CitextQueryTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/CitextQueryTest.cs
@@ -33,7 +33,7 @@ public void StartsWith_literal()
             AssertSql(
                 @"SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (s.""CaseInsensitiveText"" IS NOT NULL) AND (s.""CaseInsensitiveText"" LIKE 'some%')
+WHERE s.""CaseInsensitiveText"" IS NOT NULL AND (s.""CaseInsensitiveText"" LIKE 'some%')
 LIMIT 2");
         }
 
@@ -50,7 +50,7 @@ public void StartsWith_param_pattern()
 
 SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (@__param_0 = '') OR ((s.""CaseInsensitiveText"" IS NOT NULL) AND ((s.""CaseInsensitiveText"" LIKE @__param_0 || '%' ESCAPE '') AND (left(s.""CaseInsensitiveText"", length(@__param_0))::citext = @__param_0::citext)))
+WHERE (@__param_0 = '') OR (s.""CaseInsensitiveText"" IS NOT NULL AND ((s.""CaseInsensitiveText"" LIKE @__param_0 || '%' ESCAPE '') AND (left(s.""CaseInsensitiveText"", length(@__param_0))::citext = @__param_0::citext)))
 LIMIT 2");
         }
 
@@ -67,7 +67,7 @@ public void StartsWith_param_instance()
 
 SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (s.""CaseInsensitiveText"" = '') OR ((s.""CaseInsensitiveText"" IS NOT NULL) AND ((@__param_0 LIKE s.""CaseInsensitiveText"" || '%' ESCAPE '') AND (left(@__param_0, length(s.""CaseInsensitiveText""))::citext = s.""CaseInsensitiveText""::citext)))
+WHERE (s.""CaseInsensitiveText"" = '') OR (s.""CaseInsensitiveText"" IS NOT NULL AND ((@__param_0 LIKE s.""CaseInsensitiveText"" || '%' ESCAPE '') AND (left(@__param_0, length(s.""CaseInsensitiveText""))::citext = s.""CaseInsensitiveText""::citext)))
 LIMIT 2");
         }
 
@@ -81,7 +81,7 @@ public void EndsWith_literal()
             AssertSql(
                 @"SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (s.""CaseInsensitiveText"" IS NOT NULL) AND (s.""CaseInsensitiveText"" LIKE '%sometext')
+WHERE s.""CaseInsensitiveText"" IS NOT NULL AND (s.""CaseInsensitiveText"" LIKE '%sometext')
 LIMIT 2");
         }
 
@@ -98,7 +98,7 @@ public void EndsWith_param_pattern()
 
 SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (@__param_0 = '') OR ((s.""CaseInsensitiveText"" IS NOT NULL) AND (right(s.""CaseInsensitiveText"", length(@__param_0))::citext = @__param_0::citext))
+WHERE (@__param_0 = '') OR (s.""CaseInsensitiveText"" IS NOT NULL AND (right(s.""CaseInsensitiveText"", length(@__param_0))::citext = @__param_0::citext))
 LIMIT 2");
         }
 
@@ -115,7 +115,7 @@ public void EndsWith_param_instance()
 
 SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (s.""CaseInsensitiveText"" = '') OR ((s.""CaseInsensitiveText"" IS NOT NULL) AND (right(@__param_0, length(s.""CaseInsensitiveText""))::citext = s.""CaseInsensitiveText""::citext))
+WHERE (s.""CaseInsensitiveText"" = '') OR (s.""CaseInsensitiveText"" IS NOT NULL AND (right(@__param_0, length(s.""CaseInsensitiveText""))::citext = s.""CaseInsensitiveText""::citext))
 LIMIT 2");
         }
 
diff --git a/test/EFCore.PG.FunctionalTests/Query/JsonDomQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/JsonDomQueryTest.cs
index ce7f4a3d4..bc705a913 100644
--- a/test/EFCore.PG.FunctionalTests/Query/JsonDomQueryTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/JsonDomQueryTest.cs
@@ -310,7 +310,7 @@ public void Like()
             AssertSql(
                 @"SELECT j.""Id"", j.""CustomerDocument"", j.""CustomerElement""
 FROM ""JsonbEntities"" AS j
-WHERE (j.""CustomerElement""->>'Name' IS NOT NULL) AND (j.""CustomerElement""->>'Name' LIKE 'J%')
+WHERE j.""CustomerElement""->>'Name' IS NOT NULL AND (j.""CustomerElement""->>'Name' LIKE 'J%')
 LIMIT 2");
         }
 
diff --git a/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs
index 5b956f86b..11be7f61a 100644
--- a/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs
@@ -214,7 +214,7 @@ public void Compare_to_null()
             AssertSql(
                 @"SELECT j.""Id"", j.""Customer"", j.""ToplevelArray""
 FROM ""JsonbEntities"" AS j
-WHERE (j.""Customer""#>>'{Statistics,Nested,SomeNullableInt}' IS NULL)
+WHERE j.""Customer""#>>'{Statistics,Nested,SomeNullableInt}' IS NULL
 LIMIT 2");
         }
 
@@ -357,7 +357,7 @@ public void Like()
             AssertSql(
                 @"SELECT j.""Id"", j.""Customer"", j.""ToplevelArray""
 FROM ""JsonbEntities"" AS j
-WHERE (j.""Customer""->>'Name' IS NOT NULL) AND (j.""Customer""->>'Name' LIKE 'J%')
+WHERE j.""Customer""->>'Name' IS NOT NULL AND (j.""Customer""->>'Name' LIKE 'J%')
 LIMIT 2");
         }
 
diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindFunctionsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindFunctionsQueryNpgsqlTest.cs
index 892d35c86..f7af8fead 100644
--- a/test/EFCore.PG.FunctionalTests/Query/NorthwindFunctionsQueryNpgsqlTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindFunctionsQueryNpgsqlTest.cs
@@ -28,7 +28,7 @@ public override async Task IsNullOrWhiteSpace_in_predicate(bool async)
             AssertSql(
                 @"SELECT c.""CustomerID"", c.""Address"", c.""City"", c.""CompanyName"", c.""ContactName"", c.""ContactTitle"", c.""Country"", c.""Fax"", c.""Phone"", c.""PostalCode"", c.""Region""
 FROM ""Customers"" AS c
-WHERE (c.""Region"" IS NULL) OR (btrim(c.""Region"", E' \t\n\r') = '')");
+WHERE c.""Region"" IS NULL OR (btrim(c.""Region"", E' \t\n\r') = '')");
         }
 
         public override Task Where_math_log_new_base(bool async)
diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindJoinQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindJoinQueryNpgsqlTest.cs
index eee18cc21..a3ccf0217 100644
--- a/test/EFCore.PG.FunctionalTests/Query/NorthwindJoinQueryNpgsqlTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindJoinQueryNpgsqlTest.cs
@@ -16,10 +16,6 @@ public NorthwindJoinQueryNpgsqlTest(NorthwindQueryNpgsqlFixture<NoopModelCustomi
             //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
         }
 
-        [ConditionalTheory(Skip = "Test not yet ready")]
-        public override Task SelectMany_with_client_eval_with_constructor(bool async)
-            => base.SelectMany_with_client_eval_with_constructor(async);
-
         protected override void ClearLog()
             => Fixture.TestSqlLoggerFactory.Clear();
     }
diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs
index 832e74dd0..b57d0afdd 100644
--- a/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs
@@ -34,7 +34,7 @@ public override async Task Select_expression_date_add_year(bool async)
             AssertSql(
                 @"SELECT o.""OrderDate"" + INTERVAL '1 years' AS ""OrderDate""
 FROM ""Orders"" AS o
-WHERE (o.""OrderDate"" IS NOT NULL)");
+WHERE o.""OrderDate"" IS NOT NULL");
         }
 
         [Theory]
@@ -58,7 +58,7 @@ await AssertQuery(
 
 SELECT o.""OrderDate"" + CAST((@__years_0::text || ' years') AS interval) AS ""OrderDate""
 FROM ""Orders"" AS o
-WHERE (o.""OrderDate"" IS NOT NULL)");
+WHERE o.""OrderDate"" IS NOT NULL");
         }
 
         [Theory]
@@ -88,7 +88,7 @@ await AssertFirst(
             AssertSql(
                 @"SELECT floor(date_part('day', date_trunc('day', now()::timestamp) - date_trunc('day', o.""OrderDate"")))::INT AS ""Elapsed""
 FROM ""Orders"" AS o
-WHERE (o.""OrderDate"" IS NOT NULL)
+WHERE o.""OrderDate"" IS NOT NULL
 LIMIT 1");
         }
 
@@ -144,7 +144,7 @@ await AssertQuery(
 
 SELECT c.""CustomerID"", c.""Address"", c.""City"", c.""CompanyName"", c.""ContactName"", c.""ContactTitle"", c.""Country"", c.""Fax"", c.""Phone"", c.""PostalCode"", c.""Region""
 FROM ""Customers"" AS c
-WHERE c.""Region"" = ANY (@__regions_0) OR ((c.""Region"" IS NULL) AND (array_position(@__regions_0, NULL) IS NOT NULL))");
+WHERE c.""Region"" = ANY (@__regions_0) OR (c.""Region"" IS NULL AND array_position(@__regions_0, NULL) IS NOT NULL)");
         }
 
         [ConditionalTheory]
@@ -167,7 +167,7 @@ await AssertQuery(
 
 SELECT c.""CustomerID"", c.""Address"", c.""City"", c.""CompanyName"", c.""ContactName"", c.""ContactTitle"", c.""Country"", c.""Fax"", c.""Phone"", c.""PostalCode"", c.""Region""
 FROM ""Customers"" AS c
-WHERE c.""Region"" = ANY (@__regions_0) OR ((c.""Region"" IS NULL) AND (array_position(@__regions_0, NULL) IS NOT NULL))");
+WHERE c.""Region"" = ANY (@__regions_0) OR (c.""Region"" IS NULL AND array_position(@__regions_0, NULL) IS NOT NULL)");
         }
 
         #endregion Array contains
diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindWhereQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindWhereQueryNpgsqlTest.cs
index f7dee25f6..57c17b861 100644
--- a/test/EFCore.PG.FunctionalTests/Query/NorthwindWhereQueryNpgsqlTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindWhereQueryNpgsqlTest.cs
@@ -141,45 +141,10 @@ public override Task Where_datetimeoffset_utcnow_component(bool async)
 
         #endregion Date and time
 
-        [ConditionalTheory(Skip = "#873")]
+        // Test uses DateTimeOffset with non-zero offset, which we don't support.
+        // See supported DateTimeOffset scenarios in TimestampQueryTest
         public override Task Where_datetimeoffset_utcnow(bool async)
-            => base.Where_datetimeoffset_utcnow(async);
-
-        public override Task Where_collection_navigation_ToList_Contains(bool async)
-        {
-            var order = new Order { OrderID = 10248 };
-
-            return AssertQuery(
-                async,
-                ss => ss.Set<Customer>()
-                    .Select(c => c.Orders.OrderBy(o => o.OrderID).ToList())
-                    .Where(e => e.Contains(order)),
-                entryCount: 5);
-        }
-
-        public override Task Where_collection_navigation_ToArray_Contains(bool async)
-        {
-            var order = new Order { OrderID = 10248 };
-
-            return AssertQuery(
-                async,
-                ss => ss.Set<Customer>()
-                    .Select(c => c.Orders.AsEnumerable().OrderBy(o => o.OrderID).ToArray())
-                    .Where(e => e.Contains(order)),
-                entryCount: 5);
-        }
-
-        public override Task Where_collection_navigation_AsEnumerable_Contains(bool async)
-        {
-            var order = new Order { OrderID = 10248 };
-
-            return AssertQuery(
-                async,
-                ss => ss.Set<Customer>()
-                    .Select(c => c.Orders.OrderBy(o => o.OrderID).AsEnumerable())
-                    .Where(e => e.Contains(order)),
-                entryCount: 5);
-        }
+            => Task.CompletedTask;
 
         private void AssertSql(params string[] expected)
             => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
diff --git a/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeographyTest.cs b/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeographyTest.cs
index 3cb32064e..acdb7acd6 100644
--- a/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeographyTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeographyTest.cs
@@ -154,7 +154,7 @@ await AssertQuery(
 
             AssertSql(
                 @"SELECT p.""Id"", CASE
-    WHEN (p.""Point"" IS NULL) THEN NULL
+    WHEN p.""Point"" IS NULL THEN NULL
     ELSE lower(GeometryType(p.""Point""))
 END AS ""GeometryType""
 FROM ""PointEntity"" AS p");
diff --git a/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeometryTest.cs b/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeometryTest.cs
index 56cc90637..29fbca7c2 100644
--- a/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeometryTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeometryTest.cs
@@ -207,7 +207,7 @@ await AssertQuery(
 
             AssertSql(
                 @"SELECT p.""Id"", CASE
-    WHEN (p.""Point"" IS NULL) THEN NULL
+    WHEN p.""Point"" IS NULL THEN NULL
     ELSE lower(GeometryType(p.""Point""))
 END AS ""GeometryType""
 FROM ""PointEntity"" AS p");
diff --git a/test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs b/test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs
index 71c58c4cb..d34835713 100644
--- a/test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs
+++ b/test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs
@@ -16,6 +16,8 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL.Design.Internal
 {
     public class NpgsqlAnnotationCodeGeneratorTest
     {
+        #region Identity / sequence / HiLo
+
         [Fact]
         public void GenerateFluentApi_value_generation()
         {
@@ -216,6 +218,10 @@ public void GenerateFluentApi_IProperty_works_with_HiLo()
                 schema => Assert.Equal("HiLoIndexSchema", schema));
         }
 
+        #endregion Identity / sequence / HiLo
+
+        #region PostgreSQL extensions
+
         [ConditionalFact]
         public void Extension()
         {
@@ -263,6 +269,10 @@ public void Extension_with_null_schema()
             Assert.Collection(result.Arguments, name => Assert.Equal("postgis", name));
         }
 
+        #endregion PostgreSQL extensions
+
+        #region Enum
+
         [ConditionalFact]
         public void Enum()
         {
@@ -321,6 +331,10 @@ public void Enum_with_null_schema()
                 labels => Assert.Equal(enumLabels, labels));
         }
 
+        #endregion Enum
+
+        #region Range
+
         [ConditionalFact]
         public void Range()
         {
@@ -381,6 +395,8 @@ public void Range_with_null_schema()
                 subtype => Assert.Equal("some_subtype", subtype));
         }
 
+        #endregion Range
+
         private NpgsqlAnnotationCodeGenerator CreateGenerator()
             => new(new AnnotationCodeGeneratorDependencies(
                 new NpgsqlTypeMappingSource(