diff --git a/core/modules/field/tests/modules/field_test/field_test.module b/core/modules/field/tests/modules/field_test/field_test.module
index 8b987467df..43e2ea9946 100644
--- a/core/modules/field/tests/modules/field_test/field_test.module
+++ b/core/modules/field/tests/modules/field_test/field_test.module
@@ -169,8 +169,7 @@ function field_test_query_efq_table_prefixing_test_alter(&$query) {
  * @see \Drupal\system\Tests\Entity\EntityQueryTest::testMetaData()
  */
 function field_test_query_efq_metadata_test_alter(&$query) {
-  global $efq_test_metadata;
-  $efq_test_metadata = $query->getMetadata('foo');
+  field_test_memorize(__FUNCTION__, $query->getMetadata('foo'));
 }
 
 /**
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 6be9d6a7ba..0ccf4ef10f 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -160,6 +160,7 @@
     </properties>
   </rule>
   <rule ref="Drupal.NamingConventions.ValidClassName"/>
+  <rule ref="Drupal.NamingConventions.ValidGlobal"/>
   <rule ref="Generic.NamingConventions.ConstructorName"/>
   <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
   <rule ref="Generic.PHP.DeprecatedFunctions"/>
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
index d3d3685d70..0aba5ec931 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
@@ -768,14 +768,16 @@ protected function assertBundleOrder($order) {
    * The tags and metadata should propagate to the SQL query object.
    */
   public function testMetaData() {
+    field_test_memorize();
+
     $query = $this->storage->getQuery()->accessCheck(FALSE);
     $query
       ->addTag('efq_metadata_test')
       ->addMetaData('foo', 'bar')
       ->execute();
 
-    global $efq_test_metadata;
-    $this->assertEqual('bar', $efq_test_metadata, 'Tag and metadata propagated to the SQL query object.');
+    $mem = field_test_memorize();
+    $this->assertEquals('bar', $mem['field_test_query_efq_metadata_test_alter'][0], 'Tag and metadata propagated to the SQL query object.');
   }
 
   /**