diff --git a/core/modules/views_ui/src/Tests/PreviewTest.php b/core/modules/views_ui/src/Tests/PreviewTest.php
index 3b4dd9b..d2dcd12 100644
--- a/core/modules/views_ui/src/Tests/PreviewTest.php
+++ b/core/modules/views_ui/src/Tests/PreviewTest.php
@@ -105,7 +105,7 @@ function testPreviewUI() {
     $this->assertText(t('Query execute time'));
     $this->assertText(t('View render time'));
     $this->assertRaw('<strong>Query</strong>');
-    $this->assertText("SELECT views_test_data.name AS views_test_data_name\nFROM \n{views_test_data} views_test_data\nWHERE (( (views_test_data.id = &#039;100&#039; ) ))");
+    $this->assertText("SELECT views_test_data.name AS views_test_data_name\nFROM \n{views_test_data} views_test_data\nWHERE (views_test_data.id = &#039;100&#039; )");
 
     // Test that the statistics and query are rendered above the preview.
     $this->assertTrue(strpos($this->getRawContent(), 'views-query-info') < strpos($this->getRawContent(), 'view-test-preview'), 'Statistics shown above the preview.');
diff --git a/core/tests/Drupal/Tests/Core/Database/ConditionTest.php b/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
index 6a05726..6146d7c 100644
--- a/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
@@ -39,7 +39,7 @@ public function testSimpleCondition() {
     $condition->condition('name', ['value']);
     $condition->compile($connection, $query_placeholder);
 
-    $this->assertEquals(' (name = :db_condition_placeholder_0) ', $condition->__toString());
+    $this->assertEquals('name = :db_condition_placeholder_0', $condition->__toString());
     $this->assertEquals([':db_condition_placeholder_0' => 'value'], $condition->arguments());
   }
 
@@ -96,28 +96,28 @@ public function dataProviderTestCompileWithKnownOperators() {
     // aren't directly supported by core, but instead need manual handling with
     // prefix/suffix at the moment.
     $data = [];
-    $data[] = [' (name = :db_condition_placeholder_0) ', 'name', 'value', '='];
-    $data[] = [' (name != :db_condition_placeholder_0) ', 'name', 'value', '!='];
-    $data[] = [' (name <> :db_condition_placeholder_0) ', 'name', 'value', '<>'];
-    $data[] = [' (name >= :db_condition_placeholder_0) ', 'name', 'value', '>='];
-    $data[] = [' (name > :db_condition_placeholder_0) ', 'name', 'value', '>'];
-    $data[] = [' (name <= :db_condition_placeholder_0) ', 'name', 'value', '<='];
-    $data[] = [' (name < :db_condition_placeholder_0) ', 'name', 'value', '<'];
-    // $data[] = [' ( GREATEST (1, 2, 3) ) ', '', [1, 2, 3], 'GREATEST'];
-    $data[] = [' (name IN  (:db_condition_placeholder_0, :db_condition_placeholder_1, :db_condition_placeholder_2)) ', 'name', ['1', '2', '3'], 'IN'];
-    $data[] = [' (name NOT IN  (:db_condition_placeholder_0, :db_condition_placeholder_1, :db_condition_placeholder_2)) ', 'name', ['1', '2', '3'], 'NOT IN'];
-    // $data[] = [' ( INTERVAL (1, 2, 3) ) ', '', [1, 2, 3], 'INTERVAL'];
-    $data[] = [' (name IS NULL ) ', 'name', NULL, 'IS NULL'];
-    $data[] = [' (name IS NOT NULL ) ', 'name', NULL, 'IS NOT NULL'];
-    $data[] = [' (name IS :db_condition_placeholder_0) ', 'name', 'TRUE', 'IS'];
-    // $data[] = [' ( LEAST (1, 2, 3) ) ', '', [1, 2, 3], 'LEAST'];
-    $data[] = [" (name LIKE :db_condition_placeholder_0 ESCAPE '\\\\') ", 'name', '%muh%', 'LIKE', [':db_condition_placeholder_0' => '%muh%']];
-    $data[] = [" (name NOT LIKE :db_condition_placeholder_0 ESCAPE '\\\\') ", 'name', '%muh%', 'NOT LIKE', [':db_condition_placeholder_0' => '%muh%']];
-    $data[] = [" (name BETWEEN :db_condition_placeholder_0 AND :db_condition_placeholder_1) ", 'name', [1, 2], 'BETWEEN', [':db_condition_placeholder_0' => 1, ':db_condition_placeholder_1' => 2]];
-    // $data[] = [" (name NOT BETWEEN :db_condition_placeholder_0 AND :db_condition_placeholder_1) ", 'name', [1, 2], 'NOT BETWEEN', [':db_condition_placeholder_0' => 1, ':db_condition_placeholder_1' => 2]];
-    // $data[] = [' ( STRCMP (name, :db_condition_placeholder_0) ) ', '', ['test-string'], 'STRCMP', [':db_condition_placeholder_0' => 'test-string']];
-    // $data[] = [' (EXISTS ) ', '', NULL, 'EXISTS'];
-    // $data[] = [' (name NOT EXISTS ) ', 'name', NULL, 'NOT EXISTS'];
+    $data[] = ['name = :db_condition_placeholder_0', 'name', 'value', '='];
+    $data[] = ['name != :db_condition_placeholder_0', 'name', 'value', '!='];
+    $data[] = ['name <> :db_condition_placeholder_0', 'name', 'value', '<>'];
+    $data[] = ['name >= :db_condition_placeholder_0', 'name', 'value', '>='];
+    $data[] = ['name > :db_condition_placeholder_0', 'name', 'value', '>'];
+    $data[] = ['name <= :db_condition_placeholder_0', 'name', 'value', '<='];
+    $data[] = ['name < :db_condition_placeholder_0', 'name', 'value', '<'];
+    // $data[] = ['GREATEST (1, 2, 3)', '', [1, 2, 3], 'GREATEST'];
+    $data[] = ['name IN (:db_condition_placeholder_0, :db_condition_placeholder_1, :db_condition_placeholder_2)', 'name', ['1', '2', '3'], 'IN'];
+    $data[] = ['name NOT IN (:db_condition_placeholder_0, :db_condition_placeholder_1, :db_condition_placeholder_2)', 'name', ['1', '2', '3'], 'NOT IN'];
+    // $data[] = ['INTERVAL (1, 2, 3)', '', [1, 2, 3], 'INTERVAL'];
+    $data[] = ['name IS NULL', 'name', NULL, 'IS NULL'];
+    $data[] = ['name IS NOT NULL', 'name', NULL, 'IS NOT NULL'];
+    $data[] = ['name IS :db_condition_placeholder_0', 'name', 'TRUE', 'IS'];
+    // $data[] = ['LEAST (1, 2, 3)', '', [1, 2, 3], 'LEAST'];
+    $data[] = ["name LIKE :db_condition_placeholder_0 ESCAPE '\\\\'", 'name', '%muh%', 'LIKE', [':db_condition_placeholder_0' => '%muh%']];
+    $data[] = ["name NOT LIKE :db_condition_placeholder_0 ESCAPE '\\\\'", 'name', '%muh%', 'NOT LIKE', [':db_condition_placeholder_0' => '%muh%']];
+    $data[] = ["name BETWEEN :db_condition_placeholder_0 AND :db_condition_placeholder_1", 'name', [1, 2], 'BETWEEN', [':db_condition_placeholder_0' => 1, ':db_condition_placeholder_1' => 2]];
+    // $data[] = ["name NOT BETWEEN :db_condition_placeholder_0 AND :db_condition_placeholder_1) ", 'name', [1, 2], 'NOT BETWEEN', [':db_condition_placeholder_0' => 1, ':db_condition_placeholder_1' => 2]];
+    // $data[] = ['STRCMP (name, :db_condition_placeholder_0)', '', ['test-string'], 'STRCMP', [':db_condition_placeholder_0' => 'test-string']];
+    // $data[] = ['EXISTS', '', NULL, 'EXISTS'];
+    // $data[] = ['name NOT EXISTS', 'name', NULL, 'NOT EXISTS'];
 
     return $data;
   }