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 2ec952dd196abe7adb0d1d363a323d9f5b0ad74a..ec567dc139f33b9910c9b670e5643a056d465314 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 86c639f99fe1a9c2602e5b3ccdd7f3fb3f0479b7..661496624d70503c70694a31368338585c897d87 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -163,6 +163,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 c1af0b9120a1f5fae905607d9ae8a6484810ced1..ffbf5a59d31e067642bebeceeac990831a0d8582 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->assertEquals('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.');
   }
 
   /**