diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageTest.php
index 359ebc7..0239f1c 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeAccessLanguageTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\node\Tests;
 
+use Drupal\Core\Language\Language;
+
 /**
  * Test case to verify node_access functionality for multiple languages.
  */
@@ -49,22 +51,18 @@ class NodeAccessLanguageTest extends NodeTestBase {
 
     // Enable the private node feature of node_access_test module.
     variable_set('node_access_test_private', TRUE);
+
+    // Add Hungarian and Catalan.
+    $language = new Language(array('langcode' => 'hu', 'name' => NULL));
+    language_save($language);
+    $language = new Language(array('langcode' => 'ca', 'name' => NULL));
+    language_save($language);
   }
 
   /**
    * Runs tests for node_access function with multiple languages.
    */
   function testNodeAccess() {
-    // Add Hungarian and Catalan.
-    $language = (object) array(
-      'langcode' => 'hu',
-    );
-    language_save($language);
-    $language = (object) array(
-      'langcode' => 'ca',
-    );
-    language_save($language);
-
     $web_user = $this->drupalCreateUser(array('access content'));
 
     // Creating a public Node with langcode Hungarian, will be saved as
@@ -101,16 +99,6 @@ class NodeAccessLanguageTest extends NodeTestBase {
    * Runs tests for db_select with node_access tag and langcode.
    */
   function testNodeAccessQueryTag() {
-    // Add Hungarian and Catalan.
-    $language = (object) array(
-      'langcode' => 'hu',
-    );
-    language_save($language);
-    $language = (object) array(
-      'langcode' => 'ca',
-    );
-    language_save($language);
-
     $web_user = $this->drupalCreateUser(array('access content'));
 
     // Creating a private Node with langcode Hungarian, will be saved as
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 7b5f73e..75f8023 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -3303,7 +3303,8 @@ function _node_query_node_access_alter($query, $type) {
       $subquery->condition('na.grant_' . $op, 1, '>=');
       if ($langcode === FALSE) {
         $subquery->condition('na.fallback', 1, '=');
-      } else {
+      }
+      else {
         $subquery->condition('na.langcode', $langcode, '=');
       }
 
@@ -3423,7 +3424,8 @@ function _node_access_write_grants(Node $node, $grants, $realm = NULL, $delete =
         // The record with the original langcode is used as fallback.
         if ($grant['langcode'] == $node->langcode) {
           $grant['fallback'] = 1;
-        } else {
+        }
+        else {
           $grant['fallback'] = 0;
         }
         $query->values($grant);