diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
index 078756484d66e89349eb59dde03d619f83f71bd8..84d96284b9945e52a6db58b749968bdd7fe7d4d2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
@@ -9,6 +9,7 @@ namespace Magento\Catalog\Block\Product;
  * Test class for \Magento\Catalog\Block\Product\List.
  *
  * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoAppArea frontend
  */
 class ListTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Config/Model/ConfigTest.php
index 623db01dd154451011068f6e09d90c1097e0c6e0..09ceb5584c6b7398142d673c234958b8ac2f3381 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Model/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/ConfigTest.php
@@ -36,16 +36,13 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
 
         /** @var $_configDataObject \Magento\Config\Model\Config */
         $_configDataObject = Bootstrap::getObjectManager()->create('Magento\Config\Model\Config');
-        $_configDataObject->setSection('dev')->setWebsite('base');
-
-        $_configData = $_configDataObject->load();
-        $this->assertArrayHasKey('dev/debug/template_hints', $_configData);
+        $_configData = $_configDataObject->setSection('dev')->load();
+        $this->assertArrayHasKey('dev/debug/template_hints_admin', $_configData);
         $this->assertArrayHasKey('dev/debug/template_hints_blocks', $_configData);
 
         $_configDataObject = Bootstrap::getObjectManager()->create('Magento\Config\Model\Config');
-        $_configDataObject->setSection('dev');
-        $_configData = $_configDataObject->load();
-        $this->assertArrayNotHasKey('dev/debug/template_hints', $_configData);
+        $_configData = $_configDataObject->setSection('dev')->setWebsite('base')->load();
+        $this->assertArrayNotHasKey('dev/debug/template_hints_admin', $_configData);
         $this->assertArrayNotHasKey('dev/debug/template_hints_blocks', $_configData);
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_groups.php b/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_groups.php
index 7b2c8f02ba2759a2db8405a827508bba939d4dcd..6dca3bdf2658216af2bae0b26e6772f5070bfb95 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_groups.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_groups.php
@@ -10,7 +10,7 @@ return [
             'restrict' => ['fields' => ['allow_ips' => ['value' => '']]],
             'debug' => [
                 'fields' => [
-                    'template_hints' => ['value' => '0'],
+                    'template_hints_admin' => ['value' => '0'],
                     'template_hints_blocks' => ['value' => '0'],
                 ],
             ],
diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_section.php b/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_section.php
index c13e1e3e1b81260bda69f5aaeb86d454f2e118a8..06eb5f2789efb5006880517cbc374b9c5ec74e9d 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_section.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_section.php
@@ -17,7 +17,7 @@ return [
             ],
             'debug' => [
                 'fields' => [
-                    'template_hints' => ['value' => '1'],
+                    'template_hints_storefront' => ['value' => '1'],
                     'template_hints_blocks' => ['value' => '0'],
                 ],
             ],
@@ -28,7 +28,10 @@ return [
                 'dev/log/file' => 'fileName.log',
                 'dev/log/exception_file' => 'exceptionFileName.log',
             ],
-            'dev/debug' => ['dev/debug/template_hints' => '1', 'dev/debug/template_hints_blocks' => '0'],
+            'dev/debug' => [
+                'dev/debug/template_hints_storefront' => '1',
+                'dev/debug/template_hints_blocks' => '0',
+            ],
         ],
     ]
 ];
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
index c612baf883b32e7b8a9216316473f80b630cb179..13c3a9e0c26481324defc4d7191329ccdbd25d26 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
@@ -7,6 +7,9 @@ namespace Magento\Customer\Block\Widget;
 
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * @magentoAppArea frontend
+ */
 class GenderTest extends \PHPUnit_Framework_TestCase
 {
     /** @var Gender */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/NameTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/NameTest.php
index e5aea1f1e6d9a984cffc9c8e00eecdf28b1e9a9a..fa5fb5cfbc5b3d34ce45fc0dc5ef09343443a415 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/NameTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/NameTest.php
@@ -9,6 +9,7 @@ use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Test \Magento\Customer\Block\Widget\Name
+ * @magentoAppArea frontend
  */
 class NameTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/TotalsTest.php
index 14d39817dec02dc1aa4c1304d2548827a2bf92ba..35e1a7dfc8d21e43fc9eb90dbca9afd8e02dd386 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/TotalsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/TotalsTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Sales\Block\Order;
 
+/**
+ * @magentoAppArea frontend
+ */
 class TotalsTest extends \PHPUnit_Framework_TestCase
 {
     public function testToHtmlChildrenInitialized()
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php
index 1014c56087499dc1cacb3fbb86c3edbac5df6fd7..1588c0a838047247e301f0aefc80595538e271a9 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Sales\Model\Order\Email\Sender;
 
+/**
+ * @magentoAppArea frontend
+ */
 class ShipmentSenderTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Block/Html/BreadcrumbsTest.php b/dev/tests/integration/testsuite/Magento/Theme/Block/Html/BreadcrumbsTest.php
index 594369188dd1ab65a78ac26f6a6b340adff0be24..8a315025436d82696a8bd1497415d1f2850dd053 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Block/Html/BreadcrumbsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Block/Html/BreadcrumbsTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Theme\Block\Html;
 
+/**
+ * @magentoAppArea frontend
+ */
 class BreadcrumbsTest extends \PHPUnit_Framework_TestCase
 {
     /**