diff --git a/core/modules/book/src/Tests/BookInstallTest.php b/core/modules/book/src/Tests/BookInstallTest.php
index f69905bbb4d..ba70a9bcd02 100644
--- a/core/modules/book/src/Tests/BookInstallTest.php
+++ b/core/modules/book/src/Tests/BookInstallTest.php
@@ -39,7 +39,8 @@ class BookInstallTest extends WebTestBase {
     // Install the Book module.
     try {
       $this->container->get('module_installer')->install(['book']);
-    } catch (PreExistingConfigException $e) {
+    }
+    catch (PreExistingConfigException $e) {
       $this->fail("Expected exception thrown trying to install Book module: " . $e->getMessage());
     }
   }
diff --git a/core/modules/node/src/Plugin/migrate/source/d7/Node.php b/core/modules/node/src/Plugin/migrate/source/d7/Node.php
index 85acee127c4..0de4c968523 100644
--- a/core/modules/node/src/Plugin/migrate/source/d7/Node.php
+++ b/core/modules/node/src/Plugin/migrate/source/d7/Node.php
@@ -167,4 +167,5 @@ class Node extends FieldableEntity {
       $query->where('n.tnid <> 0 AND n.tnid <> n.nid');
     }
   }
+
 }
diff --git a/core/modules/node/src/Tests/NodeCreationTest.php b/core/modules/node/src/Tests/NodeCreationTest.php
index 7c4e1424e44..2b42b78376a 100644
--- a/core/modules/node/src/Tests/NodeCreationTest.php
+++ b/core/modules/node/src/Tests/NodeCreationTest.php
@@ -77,7 +77,7 @@ class NodeCreationTest extends NodeTestBase {
     $admin_user = $this->drupalCreateUser(array('administer nodes', 'create page content'));
     $this->drupalLogin($admin_user);
     $this->drupalGet('node/add/page');
-    $this->assertNoFieldById('edit-revision', NULL , 'The revision checkbox is not present.');
+    $this->assertNoFieldById('edit-revision', NULL, 'The revision checkbox is not present.');
   }
 
   /**
diff --git a/core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php b/core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php
index 2a910fe285d..c3d2c2ed94b 100644
--- a/core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php
+++ b/core/modules/rest/src/Tests/Views/ExcludedFieldTokenTest.php
@@ -84,5 +84,4 @@ class ExcludedFieldTokenTest extends ViewTestBase {
     $this->assertIdentical($actual_json, json_encode($expected));
   }
 
-
 }
diff --git a/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldWidget/ShapeOnlyColorEditableWidget.php b/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldWidget/ShapeOnlyColorEditableWidget.php
index bcff1ec3326..ae5dd3039d9 100644
--- a/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldWidget/ShapeOnlyColorEditableWidget.php
+++ b/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldWidget/ShapeOnlyColorEditableWidget.php
@@ -17,7 +17,7 @@ use Drupal\Core\Form\FormStateInterface;
  *   },
  * )
  */
-class ShapeOnlyColorEditableWidget extends WidgetBase  {
+class ShapeOnlyColorEditableWidget extends WidgetBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php b/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
index 7b121137ea7..b66a5cfa87c 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
@@ -7,7 +7,6 @@ use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
 use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\Plugin\Migration;
 use Drupal\migrate\Plugin\MigrationDeriverTrait;
 use Drupal\migrate_drupal\Plugin\MigrateCckFieldPluginManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/views/src/Tests/Plugin/FilterTest.php b/core/modules/views/src/Tests/Plugin/FilterTest.php
index 5e26356b557..1b2cf222b59 100644
--- a/core/modules/views/src/Tests/Plugin/FilterTest.php
+++ b/core/modules/views/src/Tests/Plugin/FilterTest.php
@@ -162,4 +162,5 @@ class FilterTest extends PluginTestBase {
     $this->drupalPostForm(NULL, [], t('Update preview'));
     $this->assertNoText('An illegal choice has been detected.');
   }
+
 }
diff --git a/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
index 9f1468ba682..c63170115af 100644
--- a/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
+++ b/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest.php
@@ -2,8 +2,6 @@
 
 namespace Drupal\FunctionalTests\Entity;
 
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\ContentEntityStorageInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -14,7 +12,7 @@ use Drupal\Tests\BrowserTestBase;
  *
  * @group Entity
  */
-class ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest extends BrowserTestBase  {
+class ContentEntityFormCorrectUserInputMappingOnFieldDeltaElementsTest extends BrowserTestBase {
 
   /**
    * The ID of the type of the entity under test.
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
index e08c37ac147..70468ea11a3 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
@@ -121,4 +121,5 @@ class EntityAccessCheckTest extends UnitTestCase {
     $route_match->getParameters()->willReturn(new ParameterBag(['entity_type' => 'node', 'var_name' => $object]));
     return $route_match->reveal();
   }
+
 }