diff --git a/.htaccess.sample b/.htaccess.sample
index 776f9046cf11d..4625badce22ab 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -105,7 +105,7 @@
 </IfModule>
 
 ############################################
-## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
+## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch
 ## Please, set it on virtual host configuration level
 
 ##    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Menu/Config/XsdTest.php b/app/code/Magento/Backend/Test/Unit/Model/Menu/Config/XsdTest.php
index 9ac2359093de3..913660ee0511b 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Menu/Config/XsdTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Menu/Config/XsdTest.php
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Backend:etc/menu.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Config/XsdTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Config/XsdTest.php
index 01b35ecd23528..7420a0957f9be 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Config/XsdTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Config/XsdTest.php
@@ -21,9 +21,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_schemaFile = $urnResolver->getRealPath('urn:magento:module:Magento_Catalog:etc/catalog_attributes.xsd');
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/XsdTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/XsdTest.php
index 392eab051a976..aff864dd3190b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/XsdTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/XsdTest.php
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchemaPath = $urnResolver->getRealPath('urn:magento:module:Magento_Catalog:etc/');
         $this->_xsdValidator = new XsdValidator();
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/XsdMergedTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/XsdMergedTest.php
index e7508ab0a1d61..6da2533ac0a07 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/XsdMergedTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/XsdMergedTest.php
@@ -26,9 +26,6 @@ class XsdMergedTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath(
             'urn:magento:module:Magento_Catalog:etc/product_types_merged.xsd'
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/XsdTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/XsdTest.php
index 0e761f991b481..eb7a6f73f8ce2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/XsdTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/XsdTest.php
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Catalog:etc/product_types.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 3c063cd78a667..8c32db5812467 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -281,7 +281,7 @@ class Product extends AbstractEntity
     /**
      * @var string
      */
-    private $hashAlgorithm = 'crc32c';
+    private $hashAlgorithm = 'xxh128';
 
     /**
      * @var array
@@ -942,7 +942,6 @@ public function __construct(
         $this->linkProcessor = $linkProcessor ?? ObjectManager::getInstance()
             ->get(LinkProcessor::class);
         $this->linkProcessor->addNameToIds($this->_linkNameToId);
-        $this->hashAlgorithm = (version_compare(PHP_VERSION, '8.1.0') >= 0) ? 'xxh128' : 'crc32c';
         parent::__construct(
             $jsonHelper,
             $importExportData,
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/XsdTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/XsdTest.php
index 2acd4163d36b1..9fb4dddb97d22 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/XsdTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/XsdTest.php
@@ -27,9 +27,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Config:etc/system.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/app/code/Magento/Cron/Test/Unit/Model/Config/XsdTest.php b/app/code/Magento/Cron/Test/Unit/Model/Config/XsdTest.php
index 5ad69bce7356a..8f9595798cac0 100644
--- a/app/code/Magento/Cron/Test/Unit/Model/Config/XsdTest.php
+++ b/app/code/Magento/Cron/Test/Unit/Model/Config/XsdTest.php
@@ -20,9 +20,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdFile = $urnResolver->getRealPath('urn:magento:module:Magento_Cron:etc/crontab.xsd');
     }
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
index 2b1680d919f84..ca31df5f21053 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
@@ -88,9 +88,6 @@ class ValidateTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->customer = $this->getMockForAbstractClass(
             CustomerInterface::class,
             [],
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Address/Config/XsdTest.php b/app/code/Magento/Customer/Test/Unit/Model/Address/Config/XsdTest.php
index f1b136fa6df04..5835f535c58de 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Address/Config/XsdTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Address/Config/XsdTest.php
@@ -21,9 +21,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_schemaFile = $urnResolver->getRealPath('urn:magento:module:Magento_Customer:etc/address_formats.xsd');
     }
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/XmlConverterCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/XmlConverterCommandTest.php
index 9b1fe635b241d..59c2d9f7a9318 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/XmlConverterCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/XmlConverterCommandTest.php
@@ -41,9 +41,6 @@ class XmlConverterCommandTest extends TestCase
      */
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->formatter = $this->createMock(Formatter::class);
         $this->domFactory = $this->createMock(DomDocumentFactory::class);
         $this->xsltProcessorFactory = $this->createMock(XsltProcessorFactory::class);
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Config/XsdTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Config/XsdTest.php
index 37ca45133f366..46ced2ac712da 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Config/XsdTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Config/XsdTest.php
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Eav:etc/eav_attributes.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
index 0757eecf70af0..83d450f8b643d 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
@@ -27,9 +27,6 @@ class XsdTest extends TestCase
      */
     public function testMergedXml($fixtureXml, array $expectedErrors)
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $schemaFile = $urnResolver->getRealPath('urn:magento:module:Magento_Email:etc/email_templates.xsd');
         $this->_testXmlAgainstXsd($fixtureXml, $schemaFile, $expectedErrors);
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/XsdTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/XsdTest.php
index 438de4948c900..32f2b502bff2d 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/XsdTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/XsdTest.php
@@ -27,9 +27,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchemaPath = $urnResolver->getRealPath('urn:magento:module:Magento_ImportExport:etc/');
         $this->_xsdValidator = new XsdValidator();
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/XsdMergedTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/XsdMergedTest.php
index bcde821f94d21..9f06047f34852 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/XsdMergedTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/XsdMergedTest.php
@@ -27,9 +27,6 @@ class XsdMergedTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_ImportExport:etc/import_merged.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/XsdTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/XsdTest.php
index 39b9f44f073a0..0edf73e96cf61 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/XsdTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/XsdTest.php
@@ -27,9 +27,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_ImportExport:etc/import.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/XsdTest.php b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/XsdTest.php
index 75de3113f7fc6..c6f776a04c32a 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/XsdTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/XsdTest.php
@@ -24,9 +24,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->schemaFile = $urnResolver->getRealPath(
             'urn:magento:module:Magento_Integration:etc/integration/integration.xsd'
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Integration/XsdTest.php b/app/code/Magento/Integration/Test/Unit/Model/Config/Integration/XsdTest.php
index 71b618f674160..5e41b99d5b7c8 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Config/Integration/XsdTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/Integration/XsdTest.php
@@ -24,9 +24,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->schemaFile = $urnResolver->getRealPath(
             'urn:magento:module:Magento_Integration:etc/integration/api.xsd'
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/XsdTest.php b/app/code/Magento/Integration/Test/Unit/Model/Config/XsdTest.php
index 273b373be10ae..b33cb6f97c05b 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Config/XsdTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/XsdTest.php
@@ -25,9 +25,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->schemaFile = $urnResolver->getRealPath(
             'urn:magento:module:Magento_Integration:etc/integration/config.xsd'
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Config/XsdTest.php b/app/code/Magento/Sales/Test/Unit/Model/Config/XsdTest.php
index 79c5ea37aee08..cf3a454b5d1fd 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Config/XsdTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Config/XsdTest.php
@@ -19,9 +19,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->_xsdFile = "urn:magento:module:Magento_Sales:etc/sales.xsd";
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/XsdTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/XsdTest.php
index 1d1737210e81c..89eacbbf66e94 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/XsdTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/XsdTest.php
@@ -35,13 +35,6 @@ public static function setUpBeforeClass(): void
         self::$_schemaFilePath = $urnResolver->getRealPath('urn:magento:module:Magento_Sales:etc/pdf_file.xsd');
     }
 
-    protected function setUp(): void
-    {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
-    }
-
     /**
      * @param string $fixtureXml
      * @param array $expectedErrors
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
index b7f1e6bd2fe3f..61e3da07797c2 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
@@ -127,18 +127,16 @@ public function testMassDisableActionProductionMode($typesToDisable = [])
     /**
      * Retrieve cache states (enabled/disabled) information
      *
-     * Access configuration file directly as it is not possible to re-include modified file under HHVM
-     * @link https://github.com/facebook/hhvm/issues/1447
+     * Access configuration file directly
      *
      * @return array
-     * @SuppressWarnings(PHPMD.EvalExpression)
      */
     protected function getCacheStates()
     {
         $configFilePool = new ConfigFilePool();
         $configPath = Bootstrap::getInstance()->getAppTempDir() . '/'. DirectoryList::CONFIG .'/'
             . $configFilePool->getPath($configFilePool::APP_ENV);
-        $configData = eval(str_replace('<?php', '', file_get_contents($configPath)));
+        $configData = include $configPath;
         return $configData[State::CACHE_KEY];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php
index 8de1b5b75cfbf..2133d4450dc00 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -54,9 +54,6 @@ class ProductTest extends AbstractController
      */
     protected function setUp(): void
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('Randomly fails due to known HHVM bug (DOMText mixed with DOMElement)');
-        }
         Bootstrap::getObjectManager()->configure([
             'preferences' => [
                 \Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager::class =>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Jwt/JwtManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Jwt/JwtManagerTest.php
index 9fea27acb0bf4..27e2657135c3f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Jwt/JwtManagerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Jwt/JwtManagerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -147,7 +147,6 @@ public function testCreateRead(
             }
             $this->verifyAgainstHeaders($jwt->getProtectedHeaders(), $recreated->getProtectedHeaders()[0]);
         }
-
     }
 
     public static function getTokenVariants(): array
@@ -997,7 +996,6 @@ private static function createRsaKeys(): array
         if (!openssl_pkey_export($rsaPrivateResource, $rsaPrivate, 'pass')) {
             throw new \RuntimeException('Failed to read RSA private key');
         }
-        self::freeResource($rsaPrivateResource);
 
         return [$rsaPrivate, $rsaPublic];
     }
@@ -1024,23 +1022,10 @@ private static function createEcKeys(): array
             if (!openssl_pkey_export($privateResource, $esPrivate, 'pass')) {
                 throw new \RuntimeException('Failed to read EC private key');
             }
-            self::freeResource($privateResource);
             $ecKeys[$bits] = [$esPrivate, $esPublic];
             unset($privateResource, $esPublic, $esPrivate);
         }
 
         return $ecKeys;
     }
-
-    /**
-     * @param mixed $resource
-     *
-     * @return void
-     */
-    private static function freeResource($resource): void
-    {
-        if (\is_resource($resource) && (version_compare(PHP_VERSION, '8.0') < 0)) {
-            openssl_free_key($resource);
-        }
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/MemoryUsageTest.php b/dev/tests/integration/testsuite/Magento/MemoryUsageTest.php
index cff3bae8bc2e1..46cafe5b51535 100644
--- a/dev/tests/integration/testsuite/Magento/MemoryUsageTest.php
+++ b/dev/tests/integration/testsuite/Magento/MemoryUsageTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento;
 
@@ -10,7 +10,7 @@ class MemoryUsageTest extends \PHPUnit\Framework\TestCase
     /**
      * Number of application reinitialization iterations to be conducted by tests
      */
-    const APP_REINITIALIZATION_LOOPS = 20;
+    private const APP_REINITIALIZATION_LOOPS = 20;
 
     /**
      * @var \Magento\TestFramework\Helper\Memory
@@ -19,9 +19,6 @@ class MemoryUsageTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp(): void
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped("Test not relevant because no gc in HHVM.");
-        }
         $this->_helper = new \Magento\TestFramework\Helper\Memory(
             new \Magento\Framework\Shell(new \Magento\Framework\Shell\CommandRenderer())
         );
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/ConfigTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/ConfigTest.php
index 5f91605018a04..68d02a80cbc0c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/ConfigTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Cache/ConfigTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types = 1);
 
@@ -37,9 +37,6 @@ class ConfigTest extends TestCase
      */
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->urnResolver = new UrnResolver();
         $this->xsdSchema = $this->urnResolver->getRealPath(
             'urn:magento:framework:Cache/etc/cache.xsd'
diff --git a/lib/internal/Magento/Framework/Acl/Test/Unit/AclResource/Config/MergedXsdTest.php b/lib/internal/Magento/Framework/Acl/Test/Unit/AclResource/Config/MergedXsdTest.php
index fd9466b47f0a2..360ab4f8bf55f 100644
--- a/lib/internal/Magento/Framework/Acl/Test/Unit/AclResource/Config/MergedXsdTest.php
+++ b/lib/internal/Magento/Framework/Acl/Test/Unit/AclResource/Config/MergedXsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -32,9 +32,6 @@ class MergedXsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->_schemaLocator = new SchemaLocator(
             new UrnResolver()
         );
diff --git a/lib/internal/Magento/Framework/Acl/Test/Unit/AclResource/Config/XsdTest.php b/lib/internal/Magento/Framework/Acl/Test/Unit/AclResource/Config/XsdTest.php
index fda96132db59a..cf75dd7247a49 100644
--- a/lib/internal/Magento/Framework/Acl/Test/Unit/AclResource/Config/XsdTest.php
+++ b/lib/internal/Magento/Framework/Acl/Test/Unit/AclResource/Config/XsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -32,9 +32,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->_schemaLocator = new SchemaLocator(
             new UrnResolver()
         );
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/XsdTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/XsdTest.php
index 3cbef6c922e6d..38263ffb99f68 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/XsdTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/XsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -21,9 +21,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_schemaFile = $urnResolver->getRealPath('urn:magento:framework:Api/etc/extension_attributes.xsd');
     }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
index 6e0ae817409d7..6fdb91b4f8040 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -65,9 +65,6 @@ class ReaderTest extends TestCase
      */
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->objectManager = new ObjectManager($this);
         $this->filePath = __DIR__ . '/_files/';
         $this->fileResolverMock = $this->getMockForAbstractClass(FileResolverInterface::class);
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/XsdTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/XsdTest.php
index bb0c31812d2db..1fcb53d572885 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/XsdTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/XsdTest.php
@@ -1,8 +1,7 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -27,9 +26,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->xsdSchema = $urnResolver->getRealPath('urn:magento:module:Magento_Store:etc/config.xsd');
         $this->xsdValidator = new XsdValidator();
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/XsdTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/XsdTest.php
index 60cf1d4346d41..3ca965463fe94 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/XsdTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/XsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath('urn:magento:framework:App/etc/routes.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/XsdTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/XsdTest.php
index 99f3ded77f734..2dafeb410e3c5 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/XsdTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/Config/XsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath('urn:magento:framework:App/etc/resources.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
index aa72067344c18..f1239ddaaab7d 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/DomTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -151,9 +151,6 @@ public function testMergeException()
      */
     public function testValidate($xml, array $expectedErrors)
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $actualErrors = [];
 
         $dom = new Dom($xml, $this->validationStateMock, [], null, null);
@@ -205,9 +202,6 @@ public function testValidateCustomErrorFormatInvalid()
 
     public function testValidateUnknownError()
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $xml = '<root><node id="id1"/><node id="id2"/></root>';
         $schemaFile = __DIR__ . '/_files/sample.xsd';
         $dom = new Dom($xml, $this->validationStateMock);
@@ -225,9 +219,6 @@ public function testValidateUnknownError()
     public function testValidateDomDocumentThrowsException()
     {
         $this->expectException('Magento\Framework\Config\Dom\ValidationSchemaException');
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $xml = '<root><node id="id1"/><node id="id2"/></root>';
         $schemaFile = __DIR__ . '/_files/sample.xsd';
         $dom = new Dom($xml, $this->validationStateMock);
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
index 8ad94da3ea053..72317f9b790cf 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -55,9 +55,6 @@ class FilesystemTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->_file = file_get_contents(__DIR__ . '/../_files/reader/config.xml');
         $this->_fileResolverMock = $this->getMockForAbstractClass(FileResolverInterface::class);
         $this->_converterMock = $this->getMockForAbstractClass(ConverterInterface::class);
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/XsdTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/XsdTest.php
index 73c5da267f6a9..3e99c47d73601 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/XsdTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/XsdTest.php
@@ -22,9 +22,6 @@ class XsdTest extends TestCase
      */
     public function testInvalidXmlFile($xsdFile, $invalidXmlFile, $expectedErrorsQty)
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $dom = new \DOMDocument();
         $dom->load(__DIR__ . "/_files/{$invalidXmlFile}");
         $schema = __DIR__ . "/../../etc/{$xsdFile}";
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php
index 0a00d646bf707..30680ddc3778d 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/DB/Statement/MysqlTest.php
@@ -87,7 +87,7 @@ public function testExecuteWhenThrowPDOException()
         $this->pdoStatementMock->expects($this->once())
             ->method('execute')
             ->willThrowException(new \PDOException('test message'));
-        $this->setQueryStringForPdoStmtMock($query);
+        $this->pdoStatementMock->queryString = $query;
         $this->assertEquals($errorReporting, error_reporting(), 'Error report level was\'t restored');
 
         (new Mysql($this->adapterMock, $query))->_execute();
@@ -181,20 +181,4 @@ function (
 
         (new Mysql($this->adapterMock, $query))->_execute($params);
     }
-
-    /**
-     * Initialize queryString property.
-     *
-     * @param string $query
-     *
-     * @return void
-     */
-    private function setQueryStringForPdoStmtMock(string $query): void
-    {
-        /*
-         * In PHP 8.1 $queryString is a Typed property, thus it should be initialized before the 1st call.
-         * But it's not automatically initialized in case of Mocking, so we do it here.
-         */
-        $this->pdoStatementMock->queryString = $query;
-    }
 }
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/XsdTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/XsdTest.php
index c83af6c566a66..1890b35844718 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/XsdTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/XsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -25,9 +25,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->_typesXsdSchema = __DIR__ . "/_files/types_schema.xsd";
         $this->_xsdValidator = new XsdValidator();
     }
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Config/XsdTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Config/XsdTest.php
index 0ffe1476d7703..d46a740452939 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Config/XsdTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Config/XsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath('urn:magento:framework:Event/etc/events.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/XsdTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/XsdTest.php
index acbc63a5942b5..c3c499d13efed 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/XsdTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/XsdTest.php
@@ -32,9 +32,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->urnResolver = new UrnResolver();
         $this->_xsdSchema = $this->urnResolver->getRealPath('urn:magento:framework:Indexer/etc/indexer.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/lib/internal/Magento/Framework/Jwt/JwkFactory.php b/lib/internal/Magento/Framework/Jwt/JwkFactory.php
index 2579a90fcea1c..b007254253b6e 100644
--- a/lib/internal/Magento/Framework/Jwt/JwkFactory.php
+++ b/lib/internal/Magento/Framework/Jwt/JwkFactory.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -750,6 +750,11 @@ public function createPbes2Hs512A256kw(string $password, ?string $kid = null): J
         return $this->createOct($password, Jwk::PUBLIC_KEY_USE_ENCRYPTION, Jwk::ALGORITHM_PBES2_HS512_A256KW, $kid);
     }
 
+    /**
+     * Create JWK with "none" algorithm (no signature/encryption).
+     *
+     * @return Jwk
+     */
     public function createNone(): Jwk
     {
         return new Jwk(
@@ -761,6 +766,15 @@ public function createNone(): Jwk
         );
     }
 
+    /**
+     * Create JWK with octet sequence key type.
+     *
+     * @param string $key
+     * @param string $use
+     * @param string $algo
+     * @param string|null $kid
+     * @return Jwk
+     */
     private function createOct(string $key, string $use, string $algo, ?string $kid): Jwk
     {
         if (strlen($key) < 2048) {
@@ -781,11 +795,20 @@ private function createOct(string $key, string $use, string $algo, ?string $kid)
         );
     }
 
+    /**
+     * Create JWK with private RSA key.
+     *
+     * @param string $key
+     * @param string|null $pass
+     * @param string $use
+     * @param string $algorithm
+     * @param string|null $kid
+     * @return Jwk
+     */
     private function createPrivateRsa(string $key, ?string $pass, string $use, string $algorithm, ?string $kid): Jwk
     {
         $resource = openssl_get_privatekey($key, (string)$pass);
         $keyData = openssl_pkey_get_details($resource)['rsa'];
-        $this->freeResource($resource);
         $keysMap = [
             'n' => 'n',
             'e' => 'e',
@@ -817,11 +840,19 @@ private function createPrivateRsa(string $key, ?string $pass, string $use, strin
         );
     }
 
+    /**
+     * Create JWK with public RSA key.
+     *
+     * @param string $key
+     * @param string $use
+     * @param string $algorithm
+     * @param string|null $kid
+     * @return Jwk
+     */
     private function createPublicRsa(string $key, string $use, string $algorithm, ?string $kid): Jwk
     {
         $resource = openssl_get_publickey($key);
         $keyData = openssl_pkey_get_details($resource)['rsa'];
-        $this->freeResource($resource);
         $keysMap = [
             'n' => 'n',
             'e' => 'e'
@@ -847,6 +878,17 @@ private function createPublicRsa(string $key, string $use, string $algorithm, ?s
         );
     }
 
+    /**
+     * Create JWK with private EC (Elliptic Curve) key.
+     *
+     * @param string $key
+     * @param string|null $pass
+     * @param int|null $validateCurveBits
+     * @param string $algorithm
+     * @param string $use
+     * @param string|null $kid
+     * @return Jwk
+     */
     private function createPrivateEc(
         string $key,
         ?string $pass,
@@ -857,7 +899,6 @@ private function createPrivateEc(
     ): Jwk {
         $resource = openssl_get_privatekey($key, (string)$pass);
         $keyData = openssl_pkey_get_details($resource)['ec'];
-        $this->freeResource($resource);
         if (!array_key_exists($keyData['curve_oid'], self::EC_CURVE_MAP)) {
             throw new \RuntimeException('Unsupported EC curve');
         }
@@ -886,6 +927,16 @@ private function createPrivateEc(
         );
     }
 
+    /**
+     * Create JWK with public EC (Elliptic Curve) key.
+     *
+     * @param string $key
+     * @param int|null $validateCurveBits
+     * @param string $algorithm
+     * @param string $use
+     * @param string|null $kid
+     * @return Jwk
+     */
     private function createPublicEc(
         string $key,
         ?int $validateCurveBits,
@@ -895,7 +946,6 @@ private function createPublicEc(
     ): Jwk {
         $resource = openssl_get_publickey($key);
         $keyData = openssl_pkey_get_details($resource)['ec'];
-        $this->freeResource($resource);
         if (!array_key_exists($keyData['curve_oid'], self::EC_CURVE_MAP)) {
             throw new \RuntimeException('Unsupported EC curve');
         }
@@ -949,16 +999,4 @@ private static function base64Decode(string $encoded): string
 
         return $value;
     }
-
-    /**
-     * @param mixed $resource
-     *
-     * @return void
-     */
-    private function freeResource($resource): void
-    {
-        if (\is_resource($resource) && (version_compare(PHP_VERSION, '8.0') < 0)) {
-            openssl_free_key($resource);
-        }
-    }
 }
diff --git a/lib/internal/Magento/Framework/Locale/Bundle/DataBundle.php b/lib/internal/Magento/Framework/Locale/Bundle/DataBundle.php
index bd22385045cd1..6ef5bb29a5e8a 100644
--- a/lib/internal/Magento/Framework/Locale/Bundle/DataBundle.php
+++ b/lib/internal/Magento/Framework/Locale/Bundle/DataBundle.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\Locale\Bundle;
 
@@ -38,6 +38,8 @@ public function get($locale)
     }
 
     /**
+     * Create resource bundle for the locale and path
+     *
      * @param string $locale
      * @param string $path
      * @return null|\ResourceBundle
@@ -47,7 +49,6 @@ protected function createResourceBundle($locale, $path)
         try {
             $bundle = new \ResourceBundle($locale, $path);
         } catch (\Exception $e) {
-            // HHVM compatibility: constructor throws on invalid resource
             $bundle = null;
         }
         return $bundle;
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
index 8ff89bb7f2ae2..844a5da42cacd 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -31,9 +31,6 @@ class XsdTest extends TestCase
      */
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/consumer.xsd');
         $this->schemaQueueFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/queue.xsd');
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/XsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/XsdTest.php
index 8e95f2eee60ee..320e66fa86879 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/XsdTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Publisher/XsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -21,9 +21,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/publisher.xsd');
     }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/MergedXsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/MergedXsdTest.php
index eaf93f2e5b9e7..a8699d781cd02 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/MergedXsdTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/MergedXsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -21,9 +21,6 @@ class MergedXsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/topology_merged.xsd');
     }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/XsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/XsdTest.php
index 3e3f1cf7ab828..44ba618647cf1 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/XsdTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Topology/XsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -21,9 +21,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->schemaFile = $urnResolver->getRealPath('urn:magento:framework-message-queue:etc/topology.xsd');
     }
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/XsdTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/XsdTest.php
index 310d66b774523..b1f3320499f30 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/XsdTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/XsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath('urn:magento:framework:Mview/etc/mview.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/ProxyTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/ProxyTest.php
index 854b60d9e28a1..4eeac8f70897d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/ProxyTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/ProxyTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -15,8 +15,6 @@
 
 class ProxyTest extends TestCase
 {
-    private const MIXED_TYPE_PHP_VERSION = '8.0.0';
-
     /**
      * @var MockObject
      */
@@ -57,10 +55,6 @@ public function testGenerate()
 
     public function testGenerateMixedType()
     {
-        if (version_compare(PHP_VERSION, self::MIXED_TYPE_PHP_VERSION) < 0) {
-            $this->markTestSkipped('This test requires at least PHP version ' . self::MIXED_TYPE_PHP_VERSION);
-        }
-
         require_once __DIR__ . '/_files/SampleMixed.php';
         $model = $this->getMockBuilder(Proxy::class)
             ->onlyMethods(['_validateData'])
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/XsdTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/XsdTest.php
index b20ebe06a663a..5fb53f98e5d38 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/XsdTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/XsdTest.php
@@ -32,9 +32,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->_schemaLocator = new SchemaLocator();
         $this->_xsdSchema = $this->_schemaLocator->getSchema();
         $this->_xsdValidator = new XsdValidator();
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php
index 9a6c319d729c8..93e82202f5bca 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Framework\Stdlib\DateTime;
@@ -34,7 +34,7 @@ public function __construct(
         $useIntlFormatObject = null,
         ?ResolverInterface $localeResolver = null
     ) {
-        $this->useIntlFormatObject = $useIntlFormatObject ?? !\defined('HHVM_VERSION');
+        $this->useIntlFormatObject = $useIntlFormatObject ?? true;
         $this->localeResolver = $localeResolver
             ?? ObjectManager::getInstance()->get(ResolverInterface::class);
     }
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
index d5b4020490a6d..392f7b7d871ae 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -27,9 +27,6 @@ class DateTimeFormatterTest extends TestCase
 
     protected function setUp(): void
     {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('Skip this test for hhvm due to problem with \IntlDateFormatter::formatObject');
-        }
         $this->objectManager = new ObjectManager($this);
         $this->localeResolverMock = $this->getMockBuilder(ResolverInterface::class)
             ->disableOriginalConstructor()
diff --git a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Utility/XsdValidatorTest.php b/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Utility/XsdValidatorTest.php
index e6920ae14245d..0ba9a8e44494b 100644
--- a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Utility/XsdValidatorTest.php
+++ b/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Utility/XsdValidatorTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -25,9 +25,6 @@ class XsdValidatorTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->_validator = new XsdValidator();
         $this->_xsdSchema = realpath(__DIR__ . '/_files/valid.xsd');
     }
diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
index c61f3e302eceb..2f4ed8aea210a 100644
--- a/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\Validator\Test\Unit;
 
@@ -42,9 +42,6 @@ class ConfigTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->_objectManager = new ObjectManager($this);
         $this->urnResolver = new UrnResolver();
     }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/XsdTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/XsdTest.php
index 3ccb756f990e5..a1c4eba1dd202 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/XsdTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/XsdTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -26,9 +26,6 @@ class XsdTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $urnResolver = new UrnResolver();
         $this->_xsdSchema = $urnResolver->getRealPath('urn:magento:framework:View/Layout/etc/page_configuration.xsd');
         $this->_xsdValidator = new XsdValidator();
diff --git a/lib/internal/Magento/Framework/Xml/Test/Unit/ParserTest.php b/lib/internal/Magento/Framework/Xml/Test/Unit/ParserTest.php
index 713ecf6fe463c..56ea21d907187 100644
--- a/lib/internal/Magento/Framework/Xml/Test/Unit/ParserTest.php
+++ b/lib/internal/Magento/Framework/Xml/Test/Unit/ParserTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -17,9 +17,6 @@ class ParserTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!function_exists('libxml_set_external_entity_loader')) {
-            $this->markTestSkipped('Skipped on HHVM. Will be fixed in MAGETWO-45033');
-        }
         $this->parser = new Parser();
     }
 
diff --git a/pub/.htaccess b/pub/.htaccess
index 1b5d7e007000f..ac5e889aa531a 100644
--- a/pub/.htaccess
+++ b/pub/.htaccess
@@ -127,7 +127,7 @@
 </IfModule>
 
 ############################################
-## Workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
+## Workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch
 ## Please, set it on virtual host configuration level
 
 ##    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1