diff --git a/composer/Composer.php b/composer/Composer.php
index cf85d515d7..c08adab44e 100644
--- a/composer/Composer.php
+++ b/composer/Composer.php
@@ -51,7 +51,7 @@ public static function ensureBehatDriverVersions() {
 
     $expectedVersion = '1.3.x-dev';
     $behatMinkSelenium2DriverInfo = $drupalCoreComposer->packageLockInfo('behat/mink-selenium2-driver', TRUE);
-    if($behatMinkSelenium2DriverInfo['version'] != $expectedVersion) {
+    if ($behatMinkSelenium2DriverInfo['version'] != $expectedVersion) {
       $drupalVersion = \Drupal::VERSION;
       $message = <<< __EOT__
 Drupal requires behat/mink-selenium2-driver:$expectedVersion in its composer.json
diff --git a/composer/Generator/PackageGenerator.php b/composer/Generator/PackageGenerator.php
index 06f59b517e..1dacb05654 100644
--- a/composer/Generator/PackageGenerator.php
+++ b/composer/Generator/PackageGenerator.php
@@ -25,7 +25,7 @@ class PackageGenerator {
    * PackageGenerator constructor.
    */
   public function __construct() {
-    $this->generatedProjectBaseDir = dirname(__DIR__) .'/Metapackage';
+    $this->generatedProjectBaseDir = dirname(__DIR__) . '/Metapackage';
   }
 
   /**
diff --git a/composer/Generator/Util/DrupalCoreComposer.php b/composer/Generator/Util/DrupalCoreComposer.php
index 56d58c03b7..1e063ceb15 100644
--- a/composer/Generator/Util/DrupalCoreComposer.php
+++ b/composer/Generator/Util/DrupalCoreComposer.php
@@ -94,7 +94,7 @@ public function getRequireDev() {
    * @return array
    *   Package info from composer.lock.
    */
-  public function packageLockInfo($packageName, $dev = false) {
+  public function packageLockInfo($packageName, $dev = FALSE) {
     $packagesSection = $dev ? 'packages-dev' : 'packages';
     foreach ($this->composerLock[$packagesSection] as $info) {
       if ($info['name'] == $packageName) {
diff --git a/core/tests/Drupal/Tests/Composer/ComposerTest.php b/core/tests/Drupal/Tests/Composer/ComposerTest.php
index 4463379cd0..7728187888 100644
--- a/core/tests/Drupal/Tests/Composer/ComposerTest.php
+++ b/core/tests/Drupal/Tests/Composer/ComposerTest.php
@@ -33,6 +33,7 @@ public function testEnsureComposerVersion() {
   public function testEnsureBehatDriverVersions() {
     // First call 'ensureBehatDriverVersions' test directly using Drupal's
     // composer.lock. It should not fail.
+    chdir($this->root);
     $this->assertNull(Composer::ensureBehatDriverVersions());
 
     // Next, call 'ensureBehatDriverVersions' again, this time using a fixture
diff --git a/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php b/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
index bdfaea7d71..21abeca07c 100644
--- a/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
+++ b/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
@@ -31,7 +31,7 @@ public function builderTestData() {
           [
             'drupal/core' => 'self.version',
             'symfony/polyfill-ctype' => 'v1.12.0',
-            'symfony/yaml' => 'v3.4.32'
+            'symfony/yaml' => 'v3.4.32',
           ],
           'conflict' =>
           [
@@ -50,7 +50,7 @@ public function builderTestData() {
           'license' => 'GPL-2.0-or-later',
           'require' =>
           [
-            'behat/mink' => '1.8.0 | 1.7.1.1 | 1.7.x-dev'
+            'behat/mink' => '1.8.0 | 1.7.1.1 | 1.7.x-dev',
           ],
           'conflict' =>
           [
@@ -71,7 +71,7 @@ public function builderTestData() {
           [
             'drupal/core' => 'self.version',
             'behat/mink' => '1.8.0 | 1.7.1.1 | 1.7.x-dev',
-            'symfony/css-selector' => 'v4.3.5'
+            'symfony/css-selector' => 'v4.3.5',
           ],
           'conflict' =>
           [