diff --git a/tests/ArrayExpressionBuilderTest.php b/tests/ArrayExpressionBuilderTest.php
index 778a25640..a374aba14 100644
--- a/tests/ArrayExpressionBuilderTest.php
+++ b/tests/ArrayExpressionBuilderTest.php
@@ -104,13 +104,13 @@ public static function buildProvider(): array
             'Query w/o type' => [
                 (new Query(self::getDb()))->select('id')->from('users')->where(['active' => 1]),
                 null,
-                'ARRAY(SELECT "id" FROM "users" WHERE "active"=1)',
+                'ARRAY(SELECT "id" FROM "users" WHERE "active" = 1)',
                 [],
             ],
             'Query' => [
                 [(new Query(self::getDb()))->select('id')->from('users')->where(['active' => 1])],
                 'integer[][]',
-                'ARRAY[ARRAY(SELECT "id" FROM "users" WHERE "active"=1)::integer[]]::integer[][]',
+                'ARRAY[ARRAY(SELECT "id" FROM "users" WHERE "active" = 1)::integer[]]::integer[][]',
                 [],
             ],
             'bool' => [
diff --git a/tests/Provider/QueryBuilderProvider.php b/tests/Provider/QueryBuilderProvider.php
index eb75d9016..87276b065 100644
--- a/tests/Provider/QueryBuilderProvider.php
+++ b/tests/Provider/QueryBuilderProvider.php
@@ -195,7 +195,7 @@ public static function insertReturningPks(): array
                     ),
                 [':phBar' => 'bar'],
                 <<<SQL
-                INSERT INTO "customer" ("email", "name", "address", "is_active", "related_id") SELECT "email", "name", "address", "is_active", "related_id" FROM "customer" WHERE ("email"=:qp1) AND ("name"=:qp2) AND ("address"=:qp3) AND ("is_active"=FALSE) AND ("related_id" IS NULL) AND ("col"=CONCAT(:phFoo, :phBar)) RETURNING "id"
+                INSERT INTO "customer" ("email", "name", "address", "is_active", "related_id") SELECT "email", "name", "address", "is_active", "related_id" FROM "customer" WHERE ("email" = :qp1) AND ("name" = :qp2) AND ("address" = :qp3) AND ("is_active" = FALSE) AND ("related_id" IS NULL) AND ("col" = CONCAT(:phFoo, :phBar)) RETURNING "id"
                 SQL,
                 [
                     ':phBar' => 'bar',
@@ -242,16 +242,16 @@ public static function upsert(): array
             ],
             'query' => [
                 3 => 'INSERT INTO "T_upsert" ("email", "status") SELECT "email", 2 AS "status" FROM "customer" ' .
-                    'WHERE "name"=:qp0 LIMIT 1 ON CONFLICT ("email") DO UPDATE SET "status"=EXCLUDED."status"',
+                    'WHERE "name" = :qp0 LIMIT 1 ON CONFLICT ("email") DO UPDATE SET "status"=EXCLUDED."status"',
             ],
             'query with update part' => [
                 2 => ['address' => 'foo {{city}}', 'status' => 2, 'orders' => new Expression('"T_upsert"."orders" + 1')],
                 3 => 'INSERT INTO "T_upsert" ("email", "status") SELECT "email", 2 AS "status" FROM "customer" ' .
-                    'WHERE "name"=:qp0 LIMIT 1 ON CONFLICT ("email") DO UPDATE SET "address"=:qp1, "status"=:qp2, "orders"="T_upsert"."orders" + 1',
+                    'WHERE "name" = :qp0 LIMIT 1 ON CONFLICT ("email") DO UPDATE SET "address"=:qp1, "status"=:qp2, "orders"="T_upsert"."orders" + 1',
             ],
             'query without update part' => [
                 3 => 'INSERT INTO "T_upsert" ("email", "status") SELECT "email", 2 AS "status" FROM "customer" ' .
-                    'WHERE "name"=:qp0 LIMIT 1 ON CONFLICT DO NOTHING',
+                    'WHERE "name" = :qp0 LIMIT 1 ON CONFLICT DO NOTHING',
             ],
             'values and expressions' => [
                 1 => ['{{%T_upsert}}.[[email]]' => 'dynamic@example.com', '[[ts]]' => new Expression('extract(epoch from now()) * 1000')],
@@ -532,8 +532,8 @@ public static function caseExpressionBuilder(): array
                             [':pv2' => $paramB = new Param('b', DataType::STRING)],
                         )),
                     ),
-                'CASE WHEN "column_name" = :qp0 THEN :qp1 WHEN "column_name" = 2 THEN (SELECT :pv2::text) END',
-                [':qp0' => 1, ':qp1' => $paramA, ':pv2' => $paramB],
+                'CASE WHEN "column_name" = 1 THEN :qp0 WHEN "column_name" = 2 THEN (SELECT :pv2::text) END',
+                [':qp0' => $paramA, ':pv2' => $paramB],
                 'b',
             ];
         }
diff --git a/tests/StructuredExpressionBuilderTest.php b/tests/StructuredExpressionBuilderTest.php
index a78bc3d79..d11caf5a1 100644
--- a/tests/StructuredExpressionBuilderTest.php
+++ b/tests/StructuredExpressionBuilderTest.php
@@ -79,13 +79,13 @@ public static function buildProvider(): array
             'Query w/o type' => [
                 (new Query(self::getDb()))->select('price')->from('product')->where(['id' => 1]),
                 null,
-                '(SELECT "price" FROM "product" WHERE "id"=1)',
+                '(SELECT "price" FROM "product" WHERE "id" = 1)',
                 [],
             ],
             'Query' => [
                 (new Query(self::getDb()))->select('price')->from('product')->where(['id' => 1]),
                 'currency_money',
-                '(SELECT "price" FROM "product" WHERE "id"=1)::currency_money',
+                '(SELECT "price" FROM "product" WHERE "id" = 1)::currency_money',
                 [],
             ],
             'ordered array' => [