From 07a4b3b595407fac5383b09d9bf0669f68dd94f4 Mon Sep 17 00:00:00 2001
From: Sanjay Patel <sanjay@wagento.com>
Date: Wed, 1 Nov 2017 16:25:02 +0530
Subject: [PATCH 001/127] #8810 - REST API - Attribute option creation -> no ID
 returned

---
 .../Api/ProductAttributeOptionManagementInterface.php     | 2 +-
 .../Eav/Api/AttributeOptionManagementInterface.php        | 2 +-
 .../Eav/Model/Entity/Attribute/OptionManagement.php       | 8 ++++++--
 .../Unit/Model/Entity/Attribute/OptionManagementTest.php  | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
index 07b7d591c3fd7..9e0014f242ba7 100644
--- a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
@@ -29,7 +29,7 @@ public function getItems($attributeCode);
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
-     * @return bool
+     * @return \Magento\Eav\Api\Data\AttributeOptionInterface
      */
     public function add($attributeCode, $option);
 
diff --git a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
index aac6e2174b1ea..566149bbd2e14 100644
--- a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
@@ -20,7 +20,7 @@ interface AttributeOptionManagementInterface
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
-     * @return bool
+     * @return \Magento\Eav\Api\Data\AttributeOptionInterface
      */
     public function add($entityType, $attributeCode, $option);
 
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
index b0508fd8cc626..11b72754a95a3 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -49,9 +49,10 @@ public function add($entityType, $attributeCode, $option)
             throw new StateException(__('Attribute %1 doesn\'t work with options', $attributeCode));
         }
 
+        $optionLabel = $option->getLabel();
         $optionId = $this->getOptionId($option);
         $options = [];
-        $options['value'][$optionId][0] = $option->getLabel();
+        $options['value'][$optionId][0] = $optionLabel;
         $options['order'][$optionId] = $option->getSortOrder();
 
         if (is_array($option->getStoreLabels())) {
@@ -67,11 +68,14 @@ public function add($entityType, $attributeCode, $option)
         $attribute->setOption($options);
         try {
             $this->resourceModel->save($attribute);
+            if ($optionLabel && $attribute->getAttributeCode()) {
+                $option->setValue($attribute->getSource()->getOptionId($optionLabel));
+            }
         } catch (\Exception $e) {
             throw new StateException(__('Cannot save attribute %1', $attributeCode));
         }
 
-        return true;
+        return $option;
     }
 
     /**
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
index 36eb78fd435e7..ed15d372f3f6b 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
@@ -80,7 +80,7 @@ public function testAdd()
         $attributeMock->expects($this->once())->method('setDefault')->with(['new_option']);
         $attributeMock->expects($this->once())->method('setOption')->with($option);
         $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock);
-        $this->assertTrue($this->model->add($entityType, $attributeCode, $optionMock));
+        $this->assertEquals($optionMock, $this->model->add($entityType, $attributeCode, $optionMock));
     }
 
     /**

From b9e0abe7d92458d075a2c5b472d07baadfcf9771 Mon Sep 17 00:00:00 2001
From: Sanjay Patel <sanjay@wagento.com>
Date: Mon, 8 Jan 2018 21:47:56 +0530
Subject: [PATCH 002/127] #8810 - Solved api functional test issue

---
 .../Entity/Attribute/OptionManagement.php     | 24 ++++++++++++++++++-
 ...AttributeOptionManagementInterfaceTest.php |  2 +-
 ...AttributeOptionManagementInterfaceTest.php |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
index 11b72754a95a3..467de64b45c6d 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -69,7 +69,7 @@ public function add($entityType, $attributeCode, $option)
         try {
             $this->resourceModel->save($attribute);
             if ($optionLabel && $attribute->getAttributeCode()) {
-                $option->setValue($attribute->getSource()->getOptionId($optionLabel));
+                $this->setOptionValue($option, $attribute, $optionLabel);
             }
         } catch (\Exception $e) {
             throw new StateException(__('Cannot save attribute %1', $attributeCode));
@@ -151,4 +151,26 @@ private function getOptionId($option)
     {
         return $option->getValue() ?: 'new_option';
     }
+
+    /**
+     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
+     * @param \Magento\Eav\Api\Data\AttributeInterface $attribute
+     * @param string $optionLabel
+     * @return void
+     */
+    public function setOptionValue($option, $attribute, $optionLabel)
+    {
+        if ($optionId = $attribute->getSource()->getOptionId($optionLabel)) {
+            $option->setValue($attribute->getSource()->getOptionId($optionId));
+        } else {
+            if (is_array($option->getStoreLabels())) {
+                foreach ($option->getStoreLabels() as $label) {
+                    if ($optionId = $attribute->getSource()->getOptionId($label->getLabel())) {
+                        $option->setValue($attribute->getSource()->getOptionId($optionId));
+                        break;
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
index 6c1e351ccd1ee..7de3f864b20a7 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
@@ -74,7 +74,7 @@ public function testAdd($optionData)
             ]
         );
 
-        $this->assertTrue($response);
+        $this->assertNotNull($response[AttributeOptionInterface::VALUE]);
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
         $this->assertEquals(
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
index 63e5282c22104..2a749b0b95177 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
@@ -42,7 +42,7 @@ public function testAdd($optionData)
             ]
         );
 
-        $this->assertTrue($response);
+        $this->assertNotNull($response[AttributeOptionInterface::VALUE]);
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
         $this->assertEquals(

From e31ea928984ceed9f5a20c49c7bc3483d2bbe49d Mon Sep 17 00:00:00 2001
From: Sanjay Patel <sanjay@wagento.com>
Date: Tue, 9 Jan 2018 12:18:00 +0530
Subject: [PATCH 003/127] #8810 - fixed php code style issue

---
 .../Model/Entity/Attribute/OptionManagement.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
index 467de64b45c6d..46b1d3c7a539f 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -158,17 +158,16 @@ private function getOptionId($option)
      * @param string $optionLabel
      * @return void
      */
-    public function setOptionValue($option, $attribute, $optionLabel)
+    protected function setOptionValue($option, $attribute, $optionLabel)
     {
-        if ($optionId = $attribute->getSource()->getOptionId($optionLabel)) {
+        $optionId = $attribute->getSource()->getOptionId($optionLabel);
+        if ($optionId) {
             $option->setValue($attribute->getSource()->getOptionId($optionId));
-        } else {
-            if (is_array($option->getStoreLabels())) {
-                foreach ($option->getStoreLabels() as $label) {
-                    if ($optionId = $attribute->getSource()->getOptionId($label->getLabel())) {
-                        $option->setValue($attribute->getSource()->getOptionId($optionId));
-                        break;
-                    }
+        } elseif (is_array($option->getStoreLabels())) {
+            foreach ($option->getStoreLabels() as $label) {
+                if ($optionId = $attribute->getSource()->getOptionId($label->getLabel())) {
+                    $option->setValue($attribute->getSource()->getOptionId($optionId));
+                    break;
                 }
             }
         }

From cd2645053091d5cee7262149dff77ad82a895978 Mon Sep 17 00:00:00 2001
From: Sergey <sergey@no.email>
Date: Mon, 5 Feb 2018 16:20:47 +0300
Subject: [PATCH 004/127] [Improvement] Implement customer group grid on ui
 component

---
 .../ResourceModel/Group/Grid/Collection.php   | 130 ++++++++++++++++-
 .../Group/Grid/CollectionTest.php             | 128 +++++++++++++++++
 .../Listing/Column/GroupActionsTest.php       | 133 ++++++++++++++++++
 .../Component/Listing/Column/GroupActions.php | 106 ++++++++++++++
 app/code/Magento/Customer/etc/di.xml          |   9 ++
 .../adminhtml/layout/customer_group_index.xml |  43 +-----
 .../ui_component/customer_group_listing.xml   |  76 ++++++++++
 7 files changed, 582 insertions(+), 43 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/CollectionTest.php
 create mode 100644 app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php
 create mode 100644 app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
 create mode 100644 app/code/Magento/Customer/view/adminhtml/ui_component/customer_group_listing.xml

diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php
index bf3400c3a2f68..f264245b30c4a 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/Collection.php
@@ -7,8 +7,62 @@
  */
 namespace Magento\Customer\Model\ResourceModel\Group\Grid;
 
-class Collection extends \Magento\Customer\Model\ResourceModel\Group\Collection
+use Magento\Customer\Model\ResourceModel\Group\Collection as GroupCollection;
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\Search\AggregationInterface;
+
+/**
+ * Collection for displaying grid of customer groups
+ */
+class Collection extends GroupCollection implements SearchResultInterface
 {
+    /**
+     * @var AggregationInterface
+     */
+    protected $aggregations;
+
+    /**
+     * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param string $mainTable
+     * @param string $eventPrefix
+     * @param string $eventObject
+     * @param string $resourceModel
+     * @param string $model
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface|string|null $connection
+     * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        $mainTable,
+        $eventPrefix,
+        $eventObject,
+        $resourceModel,
+        $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class,
+        $connection = null,
+        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+    ) {
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $connection,
+            $resource
+        );
+        $this->_eventPrefix = $eventPrefix;
+        $this->_eventObject = $eventObject;
+        $this->_init($model, $resourceModel);
+        $this->setMainTable($mainTable);
+    }
+
     /**
      * Resource initialization
      * @return $this
@@ -19,4 +73,78 @@ protected function _initSelect()
         $this->addTaxClass();
         return $this;
     }
+
+    /**
+     * @return AggregationInterface
+     */
+    public function getAggregations()
+    {
+        return $this->aggregations;
+    }
+
+    /**
+     * @param AggregationInterface $aggregations
+     * @return $this
+     */
+    public function setAggregations($aggregations)
+    {
+        $this->aggregations = $aggregations;
+        return $this;
+    }
+
+    /**
+     * Get search criteria.
+     *
+     * @return \Magento\Framework\Api\SearchCriteriaInterface|null
+     */
+    public function getSearchCriteria()
+    {
+        return null;
+    }
+
+    /**
+     * Set search criteria.
+     *
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setSearchCriteria(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null)
+    {
+        return $this;
+    }
+
+    /**
+     * Get total count.
+     *
+     * @return int
+     */
+    public function getTotalCount()
+    {
+        return $this->getSize();
+    }
+
+    /**
+     * Set total count.
+     *
+     * @param int $totalCount
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setTotalCount($totalCount)
+    {
+        return $this;
+    }
+
+    /**
+     * Set items list.
+     *
+     * @param \Magento\Framework\Api\ExtensibleDataInterface[] $items
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setItems(array $items = null)
+    {
+        return $this;
+    }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/CollectionTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/CollectionTest.php
new file mode 100644
index 0000000000000..d54c3188e5728
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/CollectionTest.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Unit\Model\ResourceModel\Group\Grid;
+
+use Magento\Customer\Model\ResourceModel\Group\Grid\Collection;
+use Magento\Framework\Api\Search\AggregationInterface;
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
+use Magento\Framework\Data\Collection\EntityFactoryInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\DB\Select;
+
+/**
+ * CollectionTest contains unit tests for \Magento\Customer\Model\ResourceModel\Group\Grid\Collection class
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var EntityFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $entityFactoryMock;
+
+    /**
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $loggerMock;
+
+    /**
+     * @var FetchStrategyInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fetchStrategyMock;
+
+    /**
+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $eventManagerMock;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionMock;
+
+    /**
+     * @var AbstractDb|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resourceMock;
+
+    /**
+     * @var AggregationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $aggregationsMock;
+
+    /**
+     * @var Select
+     */
+    protected $selectMock;
+
+    /**
+     * @var Collection
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $this->entityFactoryMock = $this->getMockBuilder(EntityFactoryInterface::class)
+            ->getMockForAbstractClass();
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->getMockForAbstractClass();
+        $this->fetchStrategyMock = $this->getMockBuilder(FetchStrategyInterface::class)
+            ->getMockForAbstractClass();
+        $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)
+            ->getMockForAbstractClass();
+        $this->resourceMock = $this->getMockBuilder(AbstractDb::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->aggregationsMock = $this->getMockBuilder(AggregationInterface::class)
+            ->getMockForAbstractClass();
+        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
+            ->getMockForAbstractClass();
+        $this->selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resourceMock->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->selectMock);
+
+        $this->model = (new ObjectManager($this))->getObject(Collection::class, [
+            'entityFactory' => $this->entityFactoryMock,
+            'logger' => $this->loggerMock,
+            'fetchStrategy' => $this->fetchStrategyMock,
+            'eventManager' => $this->eventManagerMock,
+            'mainTable' => null,
+            'eventPrefix' => 'test_event_prefix',
+            'eventObject' => 'test_event_object',
+            'resourceModel' => null,
+            'resource' => $this->resourceMock,
+        ]);
+    }
+
+    /**
+     * @covers \Magento\Customer\Model\ResourceModel\Group\Grid\Collection::setSearchCriteria
+     * @covers \Magento\Customer\Model\ResourceModel\Group\Grid\Collection::getAggregations
+     */
+    public function testSetGetAggregations()
+    {
+        $this->model->setAggregations($this->aggregationsMock);
+        $this->assertInstanceOf(AggregationInterface::class, $this->model->getAggregations());
+    }
+
+    /**
+     * @covers \Magento\Customer\Model\ResourceModel\Group\Grid\Collection::setSearchCriteria
+     */
+    public function testSetSearchCriteria()
+    {
+        $this->assertEquals($this->model, $this->model->setSearchCriteria());
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php
new file mode 100644
index 0000000000000..7dbed062a57af
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\Customer\Ui\Component\Listing\Column\GroupActions;
+use Magento\Framework\Escaper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponent\Processor;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * GroupActionsTest contains unit tests for \Magento\Customer\Ui\Component\Listing\Column\GroupActions class
+ */
+class GroupActionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GroupActions
+     */
+    protected $groupActions;
+
+    /**
+     * @var Escaper|MockObject
+     */
+    protected $escaper;
+
+    /**
+     * @var UrlInterface|MockObject
+     */
+    protected $urlBuilder;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $context = $this->createMock(ContextInterface::class);
+
+        $processor = $this->getMockBuilder(Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $context->expects(static::never())
+            ->method('getProcessor')
+            ->willReturn($processor);
+
+        $this->urlBuilder = $this->createMock(UrlInterface::class);
+
+        $this->escaper = $this->getMockBuilder(Escaper::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['escapeHtml'])
+            ->getMock();
+
+        $this->groupActions = $objectManager->getObject(GroupActions::class, [
+            'context' => $context,
+            'urlBuilder' => $this->urlBuilder,
+            'escaper' => $this->escaper,
+        ]);
+    }
+
+    /**
+     * @covers \Magento\Customer\Ui\Component\Listing\Column\GroupActions::prepareDataSource
+     */
+    public function testPrepareDataSource()
+    {
+        $groupId = 1;
+        $groupCode = 'group code';
+        $items = [
+            'data' => [
+                'items' => [
+                    [
+                        'customer_group_id' => $groupId,
+                        'customer_group_code' => $groupCode
+                    ]
+                ]
+            ]
+        ];
+        $name = 'item_name';
+        $expectedItems = [
+            [
+                'customer_group_id' => $groupId,
+                'customer_group_code' => $groupCode,
+                $name => [
+                    'edit' => [
+                        'href' => 'test/url/edit',
+                        'label' => __('Edit'),
+                    ],
+                    'delete' => [
+                        'href' => 'test/url/delete',
+                        'label' => __('Delete'),
+                        'confirm' => [
+                            'title' => __('Delete %1', $groupCode),
+                            'message' => __('Are you sure you want to delete a %1 record?', $groupCode)
+                        ],
+                    ]
+                ],
+            ]
+        ];
+
+        $this->escaper->expects(static::once())
+            ->method('escapeHtml')
+            ->with($groupCode)
+            ->willReturn($groupCode);
+
+        $this->urlBuilder->expects(static::exactly(2))
+            ->method('getUrl')
+            ->willReturnMap(
+                [
+                    [
+                        GroupActions::URL_PATH_EDIT,
+                        [
+                            'id' => $groupId
+                        ],
+                        'test/url/edit',
+                    ],
+                    [
+                        GroupActions::URL_PATH_DELETE,
+                        [
+                            'id' => $groupId
+                        ],
+                        'test/url/delete',
+                    ],
+                ]
+            );
+
+        $this->groupActions->setData('name', $name);
+
+        $actual = $this->groupActions->prepareDataSource($items);
+        static::assertEquals($expectedItems, $actual['data']['items']);
+    }
+}
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
new file mode 100644
index 0000000000000..dac8f78500879
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Ui\Component\Listing\Column;
+
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Listing\Columns\Column;
+use Magento\Framework\Escaper;
+
+/**
+ * Class GroupActions
+ */
+class GroupActions extends Column
+{
+    /**
+     * Url path
+     */
+    const URL_PATH_EDIT = 'customer/group/edit';
+    const URL_PATH_DELETE = 'customer/group/delete';
+
+    /**
+     * @var UrlInterface
+     */
+    protected $urlBuilder;
+
+    /**
+     * @var Escaper
+     */
+    protected $escaper;
+
+    /**
+     * Constructor
+     *
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param UrlInterface $urlBuilder
+     * @param Escaper $escaper
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        UrlInterface $urlBuilder,
+        Escaper $escaper,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->urlBuilder = $urlBuilder;
+        $this->escaper = $escaper;
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+    }
+
+    /**
+     * Prepare Data Source
+     *
+     * @param array $dataSource
+     * @return array
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        if (isset($dataSource['data']['items'])) {
+            foreach ($dataSource['data']['items'] as & $item) {
+                if (isset($item['customer_group_id'])) {
+                    $title = $this->escaper->escapeHtml($item['customer_group_code']);
+                    $item[$this->getData('name')] = [
+                        'edit' => [
+                            'href' => $this->urlBuilder->getUrl(
+                                static::URL_PATH_EDIT,
+                                [
+                                    'id' => $item['customer_group_id']
+                                ]
+                            ),
+                            'label' => __('Edit'),
+                        ],
+                    ];
+
+                    // hide delete action for 'NOT LOGGED IN' group
+                    if ($item['customer_group_id'] == 0 && $item['customer_group_code']) {
+                        continue;
+                    }
+
+                    $item[$this->getData('name')]['delete'] = [
+                        'href' => $this->urlBuilder->getUrl(
+                            static::URL_PATH_DELETE,
+                            [
+                                'id' => $item['customer_group_id']
+                            ]
+                        ),
+                        'label' => __('Delete'),
+                        'confirm' => [
+                            'title' => __('Delete %1', $title),
+                            'message' => __('Are you sure you want to delete a %1 record?', $title)
+                        ]
+                    ];
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
index 6df04c7f89656..7867bd992f3ac 100644
--- a/app/code/Magento/Customer/etc/di.xml
+++ b/app/code/Magento/Customer/etc/di.xml
@@ -215,6 +215,7 @@
             <argument name="collections" xsi:type="array">
                 <item name="customer_listing_data_source" xsi:type="string">Magento\Customer\Model\ResourceModel\Grid\Collection</item>
                 <item name="customer_online_grid_data_source" xsi:type="string">Magento\Customer\Model\ResourceModel\Online\Grid\Collection</item>
+                <item name="customer_group_listing_data_source" xsi:type="string">Magento\Customer\Model\ResourceModel\Group\Grid\Collection</item>
             </argument>
         </arguments>
     </type>
@@ -420,4 +421,12 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Customer\Model\ResourceModel\Group\Grid\Collection">
+        <arguments>
+            <argument name="mainTable" xsi:type="string">customer_group</argument>
+            <argument name="eventPrefix" xsi:type="string">customer_group_grid_collection</argument>
+            <argument name="eventObject" xsi:type="string">customer_group_collection</argument>
+            <argument name="resourceModel" xsi:type="string">Magento\Customer\Model\ResourceModel\Group\Collection</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml
index ecb64711bdb94..a65ef3cd395d0 100644
--- a/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml
+++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_group_index.xml
@@ -8,48 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="content">
-            <block class="Magento\Customer\Block\Adminhtml\Group" name="adminhtml.block.customer.group.grid.container">
-                <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.block.customer.group.grid" as="grid">
-                    <arguments>
-                        <argument name="id" xsi:type="string">customerGroupGrid</argument>
-                        <argument name="dataSource" xsi:type="object">Magento\Customer\Model\ResourceModel\Group\Grid\ServiceCollection</argument>
-                        <argument name="default_sort" xsi:type="string">type</argument>
-                        <argument name="default_dir" xsi:type="string">asc</argument>
-                        <argument name="save_parameters_in_session" xsi:type="string">1</argument>
-                    </arguments>
-                    <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.customer.group.grid.columnSet">
-                        <arguments>
-                            <argument name="rowUrl" xsi:type="array">
-                                <item name="path" xsi:type="string">customer/*/edit</item>
-                                <item name="extraParamsTemplate" xsi:type="array">
-                                    <item name="id" xsi:type="string">getId</item>
-                                </item>
-                            </argument>
-                        </arguments>
-                        <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.group.grid.columnSet.time" as="time">
-                            <arguments>
-                                <argument name="header" xsi:type="string" translate="true">ID</argument>
-                                <argument name="id" xsi:type="string">id</argument>
-                                <argument name="index" xsi:type="string">id</argument>
-                                <argument name="column_css_class" xsi:type="string">col-id</argument>
-                                <argument name="header_css_class" xsi:type="string">col-id</argument>
-                            </arguments>
-                        </block>
-                        <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.group.grid.columnSet.type" as="type">
-                            <arguments>
-                                <argument name="header" xsi:type="string" translate="true">Group</argument>
-                                <argument name="index" xsi:type="string">code</argument>
-                            </arguments>
-                        </block>
-                        <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.group.grid.columnSet.class_name" as="class_name">
-                            <arguments>
-                                <argument name="header" xsi:type="string" translate="true">Tax Class</argument>
-                                <argument name="index" xsi:type="string">tax_class_name</argument>
-                            </arguments>
-                        </block>
-                    </block>
-                </block>
-            </block>
+            <uiComponent name="customer_group_listing"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Customer/view/adminhtml/ui_component/customer_group_listing.xml b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_group_listing.xml
new file mode 100644
index 0000000000000..0787e0713aa9f
--- /dev/null
+++ b/app/code/Magento/Customer/view/adminhtml/ui_component/customer_group_listing.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">customer_group_listing.customer_group_listing_data_source</item>
+        </item>
+    </argument>
+    <settings>
+        <buttons>
+            <button name="add">
+                <url path="*/*/new"/>
+                <class>primary</class>
+                <label translate="true">Add New Customer Group</label>
+            </button>
+        </buttons>
+        <spinner>customer_group_columns</spinner>
+        <deps>
+            <dep>customer_group_listing.customer_group_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="customer_group_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">customer_group_id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Customer::group</aclResource>
+        <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="customer_group_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>customer_group_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <listingToolbar name="listing_top">
+        <bookmark name="bookmarks"/>
+        <columnsControls name="columns_controls"/>
+        <filters name="listing_filters"/>
+        <paging name="listing_paging"/>
+    </listingToolbar>
+    <columns name="customer_group_columns">
+        <column name="customer_group_id">
+            <settings>
+                <filter>textRange</filter>
+                <label translate="true">ID</label>
+                <sorting>asc</sorting>
+            </settings>
+        </column>
+        <column name="customer_group_code">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Group</label>
+            </settings>
+        </column>
+        <column name="tax_class_id" component="Magento_Ui/js/grid/columns/select">
+            <settings>
+                <options class="Magento\Tax\Model\TaxClass\Source\Customer"/>
+                <filter>select</filter>
+                <dataType>select</dataType>
+                <label translate="true">Tax Class</label>
+            </settings>
+        </column>
+        <actionsColumn name="actions" class="Magento\Customer\Ui\Component\Listing\Column\GroupActions">
+            <settings>
+                <indexField>customer_group_id</indexField>
+            </settings>
+        </actionsColumn>
+    </columns>
+</listing>

From 5eef1d9fd7fbe7a39344a02fab6e3795465d5af1 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Wed, 25 Apr 2018 17:25:45 +0300
Subject: [PATCH 005/127] magento/magento2#12920: Fixed review issues

---
 .../Api/ProductAttributeOptionManagementInterface.php |  2 +-
 .../Eav/Api/AttributeOptionManagementInterface.php    |  2 +-
 .../Eav/Model/Entity/Attribute/OptionManagement.php   | 11 +++++++----
 .../Model/Entity/Attribute/OptionManagementTest.php   |  2 +-
 .../ProductAttributeOptionManagementInterfaceTest.php |  2 +-
 ...ctSwatchAttributeOptionManagementInterfaceTest.php |  2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
index 9e0014f242ba7..3f255d93f96b0 100644
--- a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
@@ -29,7 +29,7 @@ public function getItems($attributeCode);
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
-     * @return \Magento\Eav\Api\Data\AttributeOptionInterface
+     * @return string
      */
     public function add($attributeCode, $option);
 
diff --git a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
index 566149bbd2e14..84aefa700a52a 100644
--- a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
@@ -20,7 +20,7 @@ interface AttributeOptionManagementInterface
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
-     * @return \Magento\Eav\Api\Data\AttributeOptionInterface
+     * @return string
      */
     public function add($entityType, $attributeCode, $option);
 
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
index f1cab45b3f341..a2c9611d26f5d 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -75,7 +75,7 @@ public function add($entityType, $attributeCode, $option)
             throw new StateException(__('The "%1" attribute can\'t be saved.', $attributeCode));
         }
 
-        return $option;
+        return $this->getOptionId($option);
     }
 
     /**
@@ -151,7 +151,7 @@ protected function validateOption($attribute, $optionId)
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @return string
      */
-    private function getOptionId($option)
+    private function getOptionId(\Magento\Eav\Api\Data\AttributeOptionInterface $option) : string
     {
         return $option->getValue() ?: 'new_option';
     }
@@ -162,8 +162,11 @@ private function getOptionId($option)
      * @param string $optionLabel
      * @return void
      */
-    protected function setOptionValue($option, $attribute, $optionLabel)
-    {
+    private function setOptionValue(
+        \Magento\Eav\Api\Data\AttributeOptionInterface $option,
+        \Magento\Eav\Api\Data\AttributeInterface $attribute,
+        string $optionLabel
+    ) {
         $optionId = $attribute->getSource()->getOptionId($optionLabel);
         if ($optionId) {
             $option->setValue($attribute->getSource()->getOptionId($optionId));
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
index 035232708e30a..2ae31a05d957f 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
@@ -81,7 +81,7 @@ public function testAdd()
         $attributeMock->expects($this->once())->method('setDefault')->with(['new_option']);
         $attributeMock->expects($this->once())->method('setOption')->with($option);
         $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock);
-        $this->assertEquals($optionMock, $this->model->add($entityType, $attributeCode, $optionMock));
+        $this->assertEquals('new_option', $this->model->add($entityType, $attributeCode, $optionMock));
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
index 7de3f864b20a7..f9442d8b6499a 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
@@ -74,7 +74,7 @@ public function testAdd($optionData)
             ]
         );
 
-        $this->assertNotNull($response[AttributeOptionInterface::VALUE]);
+        $this->assertNotNull($response);
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
         $this->assertEquals(
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
index 2a749b0b95177..6b8388e2f4345 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
@@ -42,7 +42,7 @@ public function testAdd($optionData)
             ]
         );
 
-        $this->assertNotNull($response[AttributeOptionInterface::VALUE]);
+        $this->assertNotNull($response);
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
         $this->assertEquals(

From f0c1879ccd9fee9ff42ba2a7c38a7881df85f4fc Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Fri, 27 Apr 2018 17:20:33 +0300
Subject: [PATCH 006/127] ENGCOM-1360: [Forwardport] Add argument on
 app:config:dump to skip dumping all system settings. #14807

---
 setup/performance-toolkit/benchmark.jmx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 5dc1199c0e9da..8976a4cfb824c 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -37918,9 +37918,9 @@ adminUserList.add(vars.get("admin_user"));
           <stringProp name="HTTPSampler.embedded_url_re"/>
         </HTTPSamplerProxy>
         <hashTree>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert True" enabled="true">
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Option Id" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="3569038">true</stringProp>
+              <stringProp name="89649215">^[a-z0-9_\"]+$</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>
@@ -37992,9 +37992,9 @@ adminUserList.add(vars.get("admin_user"));
           <stringProp name="HTTPSampler.embedded_url_re"/>
         </HTTPSamplerProxy>
         <hashTree>
-          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert True" enabled="true">
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert Option Id" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="3569038">true</stringProp>
+                <stringProp name="484395188">^[a-z0-9_\"]+$</stringProp>
             </collectionProp>
             <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
             <boolProp name="Assertion.assume_success">false</boolProp>

From e45bca159b02f1d0b575f750f491c2d191dbb6a0 Mon Sep 17 00:00:00 2001
From: Sergey <simpleadm@gmail.com>
Date: Mon, 7 May 2018 09:57:27 +0300
Subject: [PATCH 007/127] Added strict type declaration for new files

---
 .../Model/ResourceModel/Group/Grid/CollectionTest.php     | 8 ++++++++
 .../Unit/Ui/Component/Listing/Column/GroupActionsTest.php | 8 ++++++++
 .../Customer/Ui/Component/Listing/Column/GroupActions.php | 3 +++
 3 files changed, 19 insertions(+)

diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/CollectionTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/CollectionTest.php
index d54c3188e5728..fc4f762afb0bb 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/CollectionTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/CollectionTest.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Customer\Test\Unit\Model\ResourceModel\Group\Grid;
 
 use Magento\Customer\Model\ResourceModel\Group\Grid\Collection;
@@ -67,6 +70,11 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
+    /**
+     * SetUp method
+     *
+     * @return void
+     */
     protected function setUp()
     {
         $this->entityFactoryMock = $this->getMockBuilder(EntityFactoryInterface::class)
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php
index 7dbed062a57af..fdd841ea88cf8 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/GroupActionsTest.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Customer\Test\Unit\Ui\Component\Listing\Column;
 
 use Magento\Customer\Ui\Component\Listing\Column\GroupActions;
@@ -33,6 +36,11 @@ class GroupActionsTest extends \PHPUnit\Framework\TestCase
      */
     protected $urlBuilder;
 
+    /**
+     * SetUp method
+     *
+     * @return void
+     */
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
index dac8f78500879..4e6d8c70923ac 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Customer\Ui\Component\Listing\Column;
 
 use Magento\Framework\UrlInterface;

From ba2e1ac5556939e70276f33744adc780a274976b Mon Sep 17 00:00:00 2001
From: Sergey <simpleadm@gmail.com>
Date: Mon, 7 May 2018 14:11:40 +0300
Subject: [PATCH 008/127] Fixing fucntional tests after grid updates

---
 .../Model/ResourceModel/Group/Collection.php  |  5 ++++
 app/code/Magento/Customer/etc/di.xml          |  2 +-
 .../Adminhtml/Group/CustomerGroupGrid.php     | 27 ++++++++++++++-----
 .../Test/Handler/CustomerGroup/Curl.php       | 20 +++++++++++---
 .../Page/Adminhtml/CustomerGroupIndex.xml     |  2 +-
 5 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php
index 48710c46a5f1d..6e93210d04c3c 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group/Collection.php
@@ -12,6 +12,11 @@
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
+    /**
+     * @var string
+     */
+    protected $_idFieldName = 'customer_group_id';
+
     /**
      * Resource initialization
      *
diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
index e003529abcd07..b182ce98c7c43 100644
--- a/app/code/Magento/Customer/etc/di.xml
+++ b/app/code/Magento/Customer/etc/di.xml
@@ -439,7 +439,7 @@
             <argument name="mainTable" xsi:type="string">customer_group</argument>
             <argument name="eventPrefix" xsi:type="string">customer_group_grid_collection</argument>
             <argument name="eventObject" xsi:type="string">customer_group_collection</argument>
-            <argument name="resourceModel" xsi:type="string">Magento\Customer\Model\ResourceModel\Group\Collection</argument>
+            <argument name="resourceModel" xsi:type="string">Magento\Customer\Model\ResourceModel\Group</argument>
         </arguments>
     </type>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
index dcdf041761559..298d5bbf5c6bf 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
@@ -6,14 +6,22 @@
 
 namespace Magento\Customer\Test\Block\Adminhtml\Group;
 
-use Magento\Backend\Test\Block\Widget\Grid;
+use \Magento\Ui\Test\Block\Adminhtml\DataGrid;
+use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class CustomerGroupGrid
  * Adminhtml customer group grid
  */
-class CustomerGroupGrid extends Grid
+class CustomerGroupGrid extends DataGrid
 {
+    /**
+     * Select action toggle.
+     *
+     * @var string
+     */
+    protected $selectAction = '.action-select';
+
     /**
      * Initialize block elements
      *
@@ -21,14 +29,21 @@ class CustomerGroupGrid extends Grid
      */
     protected $filters = [
         'code' => [
-            'selector' => '#customerGroupGrid_filter_type',
+            'selector' => '.admin__data-grid-filters input[name*=customer_group_code]',
         ],
     ];
 
     /**
-     * Locator value for grid to click
+     * Click on "Edit" link.
      *
-     * @var string
+     * @param SimpleElement $rowItem
+     * @return void
      */
-    protected $editLink = 'td[data-column="time"]';
+    protected function clickEditLink(SimpleElement $rowItem)
+    {
+        if ($rowItem->find($this->selectAction)->isVisible()) {
+            $rowItem->find($this->selectAction)->click();
+        }
+        $rowItem->find($this->editLink)->click();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroup/Curl.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroup/Curl.php
index 0c1b4b7600605..e7a66139df02e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroup/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerGroup/Curl.php
@@ -9,6 +9,7 @@
 use Magento\Backend\Test\Handler\Extractor;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\Handler\Curl as AbstractCurl;
+use Magento\Mtf\Util\Protocol\CurlInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
 use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
 
@@ -59,11 +60,22 @@ public function persist(FixtureInterface $fixture = null)
      */
     public function getCustomerGroupId(array $data)
     {
-        $url = 'customer/group/index/sort/time/dir/desc';
-        $regExp = '/.*id\/(\d+)\/.*' . $data['code'] . '/siu';
-        $extractor = new Extractor($url, $regExp);
-        $match = $extractor->getData();
+        $url = $_ENV['app_backend_url'] . 'mui/index/render/';
+        $data = [
+            'namespace' => 'customer_group_listing',
+            'filters' => [
+                'placeholder' => true,
+                'customer_group_code' => $data['code']
+            ],
+            'isAjax' => true
+        ];
+        $curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
+
+        $curl->write($url, $data, CurlInterface::POST);
+        $response = $curl->read();
+        $curl->close();
 
+        preg_match('/customer_group_listing_data_source.+items.+"customer_group_id":"(\d+)"/', $response, $match);
         return empty($match[1]) ? null : $match[1];
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml
index 42ae87766c81f..7f5de5a2f6ddf 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/Adminhtml/CustomerGroupIndex.xml
@@ -9,6 +9,6 @@
   <page name="CustomerGroupIndex" area="Adminhtml" mca="customer/group/index" module="Magento_Customer">
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
     <block name="gridPageActions" class="Magento\Backend\Test\Block\GridPageActions" locator=".page-main-actions" strategy="css selector"/>
-    <block name="customerGroupGrid" class="Magento\Customer\Test\Block\Adminhtml\Group\CustomerGroupGrid" locator="#customerGroupGrid" strategy="css selector"/>
+    <block name="customerGroupGrid" class="Magento\Customer\Test\Block\Adminhtml\Group\CustomerGroupGrid" locator="//div[contains(@data-bind, 'customer_group_listing')]" strategy="xpath"/>
   </page>
 </config>

From 4f732503de69d7ed85f256a3d3967563c9ea21e9 Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <fanta1408@gmail.com>
Date: Mon, 21 May 2018 15:17:44 +0300
Subject: [PATCH 009/127] MAGETWO-90301: Extend MFTF tests to check Checkout
 Success page

---
 .../Checkout/Page/CheckoutSuccessPage.xml     |   3 +-
 .../Section/CheckoutSuccessMainSection.xml    |   4 +
 .../CheckoutSuccessRegisterSection.xml        |  16 ++
 .../Test/CheckCheckoutSuccessPageTest.xml     | 183 ++++++++++++++++++
 .../Cms/Section/StorefrontCMSPageSection.xml  |   1 +
 5 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml
 create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutSuccessPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutSuccessPage.xml
index a9ca77ab6b203..891e7fff96a3c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutSuccessPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutSuccessPage.xml
@@ -8,7 +8,8 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="CheckoutSuccessPage" url="/checkout/onepage/success/" area="storefront" module="Checkout">
+    <page name="CheckoutSuccessPage" url="/checkout/onepage/success/" area="storefront" module="Magento_Checkout">
         <section name="CheckoutSuccessMainSection"/>
+        <section name="CheckoutSuccessRegisterSection"/>
     </page>
 </pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
index 84b31b49eadc6..28597b56c04bd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
@@ -9,9 +9,13 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutSuccessMainSection">
+        <element name="successTitle" type="text" selector=".page-title"/>
         <element name="success" type="text" selector="div.checkout-success"/>
         <element name="orderNumber" type="text" selector="div.checkout-success > p:nth-child(1) > span"/>
         <element name="orderNumber22" type="text" selector=".order-number>strong"/>
         <element name="orderLink" type="text" selector="a[href*=order_id].order-number"/>
+        <element name="orderNumberText" type="text" selector=".checkout-success > p:nth-child(1)"/>
+        <element name="continueShoppingButton" type="button" selector=".action.primary.continue"/>
+        <element name="printLink" type="button" selector=".page-title-wrapper a"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml
new file mode 100644
index 0000000000000..964485d5ac294
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CheckoutSuccessRegisterSection">
+        <element name="registerMessage" type="text" selector="#registration p:nth-child(1)"/>
+        <element name="customerEmail" type="text" selector="#registration p:nth-child(2)"/>
+        <element name="createAccountButton" type="button" selector="form[data-bind = 'submit: createAccount'] input"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
new file mode 100644
index 0000000000000..0765b9579ec41
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="CheckCheckoutSuccessPageAsRegisterCustomer">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Success page elements are presented for placed order as Customer"/>
+            <title value="Customer Checkout"/>
+            <description value="To be sure that other elements of Success page are shown for placed order as registered Customer."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-60345"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleTwo" stepKey="createSimpleProduct"/>
+            <createData entity="Simple_US_Customer" stepKey="createSimpleUsCustomer">
+                <field key="group_id">1</field>
+            </createData>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
+        </after>
+
+        <!--Log in to Storefront as Customer-->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUpNewUser">
+            <argument name="Customer" value="$$createSimpleUsCustomer$$"/>
+        </actionGroup>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoadedTest3"/>
+
+        <!--Click Place Order button-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
+        <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order number is: " stepKey="seeOrderNumber"/>
+        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." stepKey="seeSuccessNotify"/>
+        <click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage2"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad2"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage2">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2"/>
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton2"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext2"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoadedTest4"/>
+
+        <!--Click Place Order button-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
+        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage2"/>
+        <click selector="{{CheckoutSuccessMainSection.continueShoppingButton}}" stepKey="clickContinueShoppingButton"/>
+        <waitForElement selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitHomePage"/>
+        <see userInput="Home Page" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeHomePageTitle"/>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage3"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad3"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage3">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart3"/>
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod3"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton3"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext3"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoadedTest5"/>
+
+        <!--Click Place Order button-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder3"/>
+        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage3"/>
+
+        <!--Check "Print Receipt" button is presented (desktop only)-->
+        <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint"/>
+        <resizeWindow width="600" height="800" stepKey="resizeWindow"/>
+        <dontSeeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeInvisiblePrint"/>
+        <maximizeWindow stepKey="maximizeWindowKey1"/>
+        <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint2" />
+
+        <!--See print page-->
+        <click selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="clickPrintLink"/>
+        <waitForPageLoad stepKey="waitPrintPage"/>
+        <switchToWindow stepKey="switchToWindow"/>
+        <waitForElement selector="#navbar-container #print-header" stepKey="waitPrintBlock"/>
+        <seeElement selector="#navbar-container #print-header" stepKey="seePrintPage"/>
+    </test>
+    <test name="CheckCheckoutSuccessPageAsGuest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Success page elements are presented for placed order as Guest"/>
+            <title value="Customer Checkout"/>
+            <description value="To be sure that other elements of Success page are presented for placed order as Guest."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-60346"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleTwo" stepKey="createSimpleProduct"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!--<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoadedTest3"/>-->
+
+        <!--Click Place Order button-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage"/>
+
+        <!--See success messages-->
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
+        <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order # is: " stepKey="seeOrderNumber"/>
+
+        <!--Check register section-->
+        <see selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." stepKey="seeSuccessNotify"/>
+        <see selector="{{CheckoutSuccessRegisterSection.registerMessage}}" userInput="You can track your order status by creating an account." stepKey="seeRegisterMessage"/>
+        <see selector="{{CheckoutSuccessRegisterSection.customerEmail}}" userInput="Email Address: {{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
+        <seeElement selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="seeVisibleCreateAccountButton"/>
+        <click selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
+        <waitForElementNotVisible selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="waitInvisibleCreateAccountButton"/>
+        <dontSeeElement selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="seeInvisibleCreateAccountButton"/>
+        <click selector="{{CheckoutSuccessMainSection.continueShoppingButton}}" stepKey="clickContinueShoppingButton"/>
+        <waitForElement selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitHomePage"/>
+        <see userInput="Home Page" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeHomePageTitle"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml
index b43bc436c498d..fc2515636a693 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml
@@ -11,5 +11,6 @@
     <section name="StorefrontCMSPageSection">
         <element name="mediaDescription" type="text" selector=".column.main>p>img"/>
         <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
+        <element name="mainTitle" type="text" selector="#maincontent .page-title"/>
     </section>
 </sections>

From 04117748c554b6b36ccee4fdf1ffd35256bccb8d Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <fanta1408@gmail.com>
Date: Wed, 23 May 2018 13:24:42 +0300
Subject: [PATCH 010/127] MAGETWO-90301: Extend MFTF tests to check Checkout
 Success page

---
 .../Section/CheckoutSuccessMainSection.xml       |  2 +-
 .../Section/CheckoutSuccessRegisterSection.xml   |  2 +-
 .../Test/CheckCheckoutSuccessPageTest.xml        | 16 ++++++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
index 28597b56c04bd..935dfd19903e2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
@@ -16,6 +16,6 @@
         <element name="orderLink" type="text" selector="a[href*=order_id].order-number"/>
         <element name="orderNumberText" type="text" selector=".checkout-success > p:nth-child(1)"/>
         <element name="continueShoppingButton" type="button" selector=".action.primary.continue"/>
-        <element name="printLink" type="button" selector=".page-title-wrapper a"/>
+        <element name="printLink" type="button" selector=".print"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml
index 964485d5ac294..f3d9d33e156fb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml
@@ -11,6 +11,6 @@
     <section name="CheckoutSuccessRegisterSection">
         <element name="registerMessage" type="text" selector="#registration p:nth-child(1)"/>
         <element name="customerEmail" type="text" selector="#registration p:nth-child(2)"/>
-        <element name="createAccountButton" type="button" selector="form[data-bind = 'submit: createAccount'] input"/>
+        <element name="createAccountButton" type="button" selector="#registration form input[type='submit']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
index 0765b9579ec41..80fd34c14d99c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
@@ -27,6 +27,9 @@
         </before>
 
         <after>
+            <!--Logout from customer account-->
+            <amOnPage url="customer/account/logout/" stepKey="logoutCustomerOne"/>
+            <waitForPageLoad stepKey="waitLogoutCustomerOne"/>
             <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
@@ -60,7 +63,10 @@
         <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
         <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order number is: " stepKey="seeOrderNumber"/>
         <see selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." stepKey="seeSuccessNotify"/>
+
         <click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
+        <waitForElement selector="{{StorefrontCustomerOrderViewSection.orderTitle}}" stepKey="waitOrderViewPage"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerOrderPage.url}}" stepKey="seeMyOrderPage"/>
 
         <!--Go to product page-->
         <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage2"/>
@@ -85,6 +91,7 @@
         <click selector="{{CheckoutSuccessMainSection.continueShoppingButton}}" stepKey="clickContinueShoppingButton"/>
         <waitForElement selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitHomePage"/>
         <see userInput="Home Page" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeHomePageTitle"/>
+        <seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}" stepKey="seeHomePageUrl"/>
 
         <!--Go to product page-->
         <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage3"/>
@@ -118,8 +125,10 @@
         <click selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="clickPrintLink"/>
         <waitForPageLoad stepKey="waitPrintPage"/>
         <switchToWindow stepKey="switchToWindow"/>
-        <waitForElement selector="#navbar-container #print-header" stepKey="waitPrintBlock"/>
-        <seeElement selector="#navbar-container #print-header" stepKey="seePrintPage"/>
+        <switchToNextTab stepKey="switchToTab"/>
+        <seeInCurrentUrl url="sales/order/print/order_id" stepKey="123"/>
+        <seeElement selector="{{StorefrontCustomerOrderViewSection.orderTitle}}" stepKey="seeOrderTitleOnPrint"/>
+        <switchToWindow stepKey="switchToWindow2"/>
     </test>
     <test name="CheckCheckoutSuccessPageAsGuest">
         <annotations>
@@ -158,8 +167,6 @@
             <argument name="customerAddressVar" value="CustomerAddressSimple" />
         </actionGroup>
 
-        <!--<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoadedTest3"/>-->
-
         <!--Click Place Order button-->
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
         <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage"/>
@@ -178,6 +185,7 @@
         <dontSeeElement selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="seeInvisibleCreateAccountButton"/>
         <click selector="{{CheckoutSuccessMainSection.continueShoppingButton}}" stepKey="clickContinueShoppingButton"/>
         <waitForElement selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitHomePage"/>
+        <seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}" stepKey="seeHomePageUrl"/>
         <see userInput="Home Page" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeHomePageTitle"/>
     </test>
 </tests>

From cf82c10f10f7713d74a9c1060d6af8130c780c42 Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <fanta1408@gmail.com>
Date: Wed, 23 May 2018 14:10:41 +0300
Subject: [PATCH 011/127] MAGETWO-90301: Extend MFTF tests to check Checkout
 Success page

---
 .../Checkout/Test/CheckCheckoutSuccessPageTest.xml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
index 80fd34c14d99c..83eb54d6f46fb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
@@ -126,7 +126,7 @@
         <waitForPageLoad stepKey="waitPrintPage"/>
         <switchToWindow stepKey="switchToWindow"/>
         <switchToNextTab stepKey="switchToTab"/>
-        <seeInCurrentUrl url="sales/order/print/order_id" stepKey="123"/>
+        <seeInCurrentUrl url="sales/order/print/order_id" stepKey="seePrintPage"/>
         <seeElement selector="{{StorefrontCustomerOrderViewSection.orderTitle}}" stepKey="seeOrderTitleOnPrint"/>
         <switchToWindow stepKey="switchToWindow2"/>
     </test>

From 15c745d47a918b56d6e5650f7465b96d5d3f2543 Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <fanta1408@gmail.com>
Date: Wed, 23 May 2018 14:21:17 +0300
Subject: [PATCH 012/127] MAGETWO-90301: Extend MFTF tests to check Checkout
 Success page

---
 .../Checkout/Test/CheckCheckoutSuccessPageTest.xml               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
index 83eb54d6f46fb..779429d095a90 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
@@ -183,6 +183,7 @@
         <click selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
         <waitForElementNotVisible selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="waitInvisibleCreateAccountButton"/>
         <dontSeeElement selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="seeInvisibleCreateAccountButton"/>
+        <see selector="{{CheckoutSuccessRegisterSection.registerMessage}}" userInput="A letter with further instructions will be sent to your email." stepKey="seeNotifyCreateAccount"/>
         <click selector="{{CheckoutSuccessMainSection.continueShoppingButton}}" stepKey="clickContinueShoppingButton"/>
         <waitForElement selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitHomePage"/>
         <seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}" stepKey="seeHomePageUrl"/>

From 59d8adeda53bb81b9df39358bd85d2670a016541 Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <fanta1408@gmail.com>
Date: Thu, 24 May 2018 16:16:18 +0300
Subject: [PATCH 013/127] MAGETWO-90301: Extend MFTF tests to check Checkout
 Success page

---
 .../Test/CheckCheckoutSuccessPageTest.xml     | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
index 779429d095a90..4b5c45a0d9529 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
@@ -181,9 +181,31 @@
         <see selector="{{CheckoutSuccessRegisterSection.customerEmail}}" userInput="Email Address: {{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
         <seeElement selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="seeVisibleCreateAccountButton"/>
         <click selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
-        <waitForElementNotVisible selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="waitInvisibleCreateAccountButton"/>
-        <dontSeeElement selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="seeInvisibleCreateAccountButton"/>
-        <see selector="{{CheckoutSuccessRegisterSection.registerMessage}}" userInput="A letter with further instructions will be sent to your email." stepKey="seeNotifyCreateAccount"/>
+        <waitForElement selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitAccountPage"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerCreatePage.url}}" stepKey="seeCreateAccountPage"/>
+        <see userInput="Create New Customer Account" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeCreateAccountPageTitle"/>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage2"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad2"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage2">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection2">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!--Click Place Order button-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
+        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage2"/>
+
+        <!--Continue shopping-->
         <click selector="{{CheckoutSuccessMainSection.continueShoppingButton}}" stepKey="clickContinueShoppingButton"/>
         <waitForElement selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitHomePage"/>
         <seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}" stepKey="seeHomePageUrl"/>

From b96c338b1a0feeedabc0ebfa017bf5ece1afdba9 Mon Sep 17 00:00:00 2001
From: Stas Puga <stas.puga@transoftgroup.com>
Date: Tue, 29 May 2018 16:46:29 +0300
Subject: [PATCH 014/127] MAGETWO-90370: Automate with MFTF Gift Options

---
 .../Section/CheckoutCartProductSection.xml       |  8 ++++++++
 .../Section/CheckoutCartSummarySection.xml       |  2 ++
 .../Section/CheckoutOrderSummarySection.xml      |  5 +++++
 .../Section/StorefrontMiniCartSection.xml        | 11 +++++++++++
 .../Sales/Page/AdminOrderDetailsPage.xml         |  1 +
 .../Section/AdminOrderGiftOptionSection.xml      | 16 ++++++++++++++++
 6 files changed, 43 insertions(+)
 create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderGiftOptionSection.xml

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
index 92c10ca83a76d..76cdca91dd600 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
@@ -26,5 +26,13 @@
                  parameterized="true"/>
         <element name="RemoveItem" type="button"
                  selector="//table[@id='shopping-cart-table']//tbody//tr[contains(@class,'item-actions')]//a[contains(@class,'action-delete')]"/>
+        <element name="giftOption" type="text" selector="//tr[contains(., '{{var1}}')]/following-sibling::*[contains(., '{{var2}}')]" parameterized="true"/>
+        <element name="giftOptionAll" type="text" selector="//div[contains(@class,'cart-gift-item')][contains(., '{{var1}}')]" parameterized="true"/>
+        <element name="clickGiftOptionsItem" type="button" selector=".gift-options-cart-item .action-gift"/>
+        <element name="clickGiftOptionsAll" type="button" selector=".gift-item-block .title span"/>
+        <element name="visibleSmallImageAll" type="text" selector=".gift-item-block .gift-options-content img"/>
+        <element name="visibleSmallImageItems" type="text" selector="#shopping-cart-table .gift-options-content img"/>
+        <element name="giftMessageAll" type="block" selector=".cart-gift-item .gift-message"/>
+        <element name="giftMessageItem" type="block" selector="#shopping-cart-table .gift-options .gift-message"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
index df236692d0d68..c63d761b5381d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
@@ -14,5 +14,7 @@
         <element name="shipping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//td//span[@class='price']"/>
         <element name="total" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']"/>
         <element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
+        <element name="giftWrappingOrderPrice" type="text" selector="//tr[@class='totals giftwrapping']//td[@data-th='Gift Wrapping for Order']"/>
+        <element name="giftPrintedCardPrice" type="text" selector="//tr[@class='totals giftwrapping']//td[@data-th='Printed Card']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
index 44bd86065b808..b124a2de8c151 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
@@ -13,5 +13,10 @@
         <element name="productItemName" type="text" selector=".product-item-name"/>
         <element name="productItemQty" type="text" selector=".value"/>
         <element name="productItemPrice" type="text" selector=".price"/>
+        <element name="giftWrappingName" type="text" selector=".gift-wrapping-name"/>
+        <element name="giftWrappingReqularPrice" type="text" selector=".gift-wrapping-title .regular-price span"/>
+        <element name="giftRemoveButton" type="button" selector=".gift-wrapping-title .action-remove"/>
+        <element name="clickImage" type="text" selector=".gift-wrapping-preview"/>
+        <element name="clickButtonGiftUpdate" type="button" selector=".gift-options .actions-toolbar button[type='submit']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml
index bdd97130a9715..028e7ceef68c7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml
@@ -23,5 +23,16 @@
         <element name="viewAndEditCart" type="button" selector=".action.viewcart" timeout="30"/>
         <element name="miniCartItemsText" type="text" selector=".minicart-items"/>
         <element name="deleteMiniCartItem" type="button" selector=".action.delete" timeout="30"/>
+        <element name="giftWrapping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals giftwrapping']//td[@class='amount']"/>
+        <element name="giftReceipt" type="text" selector=".gift-receipt label span"/>
+        <element name="giftReceiptCheckbox" type="checkbox" selector=".gift-receipt input"/>
+        <element name="giftPrintedCardCheckbox" type="checkbox" selector=".gift-printed-card input"/>
+        <element name="giftMessageTo" type="input" selector=".cart-gift-item .gift-message .gift-options-content .field-to input"/>
+        <element name="giftMessageFrom" type="input" selector=".cart-gift-item .gift-message .gift-options-content .field-from input"/>
+        <element name="giftMessage" type="textarea" selector=".cart-gift-item .gift-message .gift-options-content .text textarea"/>
+        <element name="giftWrappingNameResult" type="text" selector=".gift-summary .gift-wrapping-summary .gift-wrapping-name"/>
+        <element name="giftWrappingPriceResult" type="text" selector="//*[contains(., '{{var1}}')]/../span[@class='regular-price']//span[contains(., '{{var2}}')]" parameterized="true"/>
+        <element name="giftReceiptResult" type="text" selector=".gift-wrapping-summary span.label"/>
+        <element name="giftMessageResult" type="text" selector=".gift-message-summary span"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml
index df8f4ed63787c..0c8338b898670 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml
@@ -22,5 +22,6 @@
         <section name="AdminOrderShipmentsTabSection"/>
         <section name="AdminOrderCommentsTabSection"/>
         <section name="AdminOrderTotalSection"/>
+        <section name="AdminOrderGiftOptionSection"/>
     </page>
 </pages>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderGiftOptionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderGiftOptionSection.xml
new file mode 100644
index 0000000000000..946f3f132e7a6
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderGiftOptionSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!--
+         /**
+          * Copyright © Magento, Inc. All rights reserved.
+          * See COPYING.txt for license details.
+          */
+        -->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminOrderGiftOptionSection">
+        <element name="giftOptionsImage" type="file" selector=".order-gift-options img"/>
+        <element name="giftWrappingDesignName" type="text" selector="//div[contains(@class, 'gift-wrapping-design')]/span"/>
+        <element name="giftWrappingDesignPrice" type="text" selector=".gift-wrapping-design #price-box span .price"/>
+    </section>
+</sections>

From 39ba713abced7a28f7b40d8a9f5f6a064c3a3a8b Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <fanta1408@gmail.com>
Date: Wed, 30 May 2018 10:29:53 +0300
Subject: [PATCH 015/127]     MAGETWO-90301: Extend MFTF tests to check
 Checkout Success page

---
 .../Section/CheckoutShippingMethodsSection.xml     |  2 +-
 .../Checkout/Section/CheckoutShippingSection.xml   |  2 +-
 .../Section/CheckoutSuccessMainSection.xml         |  6 +++---
 .../Section/CheckoutSuccessRegisterSection.xml     |  2 +-
 .../Checkout/Test/CheckCheckoutSuccessPageTest.xml | 14 ++++----------
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
index a6e09494b7423..2a59d2bdc8d9b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutShippingMethodsSection">
-        <element name="next" type="button" selector="button.button.action.continue.primary"/>
+        <element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
         <element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>
         <element name="shippingMethodRow" type="text" selector=".form.methods-shipping table tbody tr"/>
         <element name="checkShippingMethodByName" type="radio" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/..//input" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
index 54fa168a1a4eb..34f32e08d38ca 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
@@ -20,7 +20,7 @@
         <element name="region" type="select" selector="select[name=region_id]"/>
         <element name="postcode" type="input" selector="input[name=postcode]"/>
         <element name="telephone" type="input" selector="input[name=telephone]"/>
-        <element name="next" type="button" selector="button.button.action.continue.primary"/>
+        <element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
         <element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
index 935dfd19903e2..2a1d84d7ccb1f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
@@ -13,9 +13,9 @@
         <element name="success" type="text" selector="div.checkout-success"/>
         <element name="orderNumber" type="text" selector="div.checkout-success > p:nth-child(1) > span"/>
         <element name="orderNumber22" type="text" selector=".order-number>strong"/>
-        <element name="orderLink" type="text" selector="a[href*=order_id].order-number"/>
+        <element name="orderLink" type="text" selector="a[href*=order_id].order-number" timeout="30"/>
         <element name="orderNumberText" type="text" selector=".checkout-success > p:nth-child(1)"/>
-        <element name="continueShoppingButton" type="button" selector=".action.primary.continue"/>
-        <element name="printLink" type="button" selector=".print"/>
+        <element name="continueShoppingButton" type="button" selector=".action.primary.continue" timeout="30"/>
+        <element name="printLink" type="button" selector=".print" timeout="30"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml
index f3d9d33e156fb..6a7690083ae92 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml
@@ -11,6 +11,6 @@
     <section name="CheckoutSuccessRegisterSection">
         <element name="registerMessage" type="text" selector="#registration p:nth-child(1)"/>
         <element name="customerEmail" type="text" selector="#registration p:nth-child(2)"/>
-        <element name="createAccountButton" type="button" selector="#registration form input[type='submit']"/>
+        <element name="createAccountButton" type="button" selector="#registration form input[type='submit']" timeout="30"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
index 4b5c45a0d9529..eba21db6ef0d1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
@@ -59,13 +59,11 @@
 
         <!--Click Place Order button-->
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage"/>
         <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
         <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order number is: " stepKey="seeOrderNumber"/>
         <see selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." stepKey="seeSuccessNotify"/>
 
         <click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
-        <waitForElement selector="{{StorefrontCustomerOrderViewSection.orderTitle}}" stepKey="waitOrderViewPage"/>
         <seeInCurrentUrl url="{{StorefrontCustomerOrderPage.url}}" stepKey="seeMyOrderPage"/>
 
         <!--Go to product page-->
@@ -87,9 +85,8 @@
 
         <!--Click Place Order button-->
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
-        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage2"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage2"/>
         <click selector="{{CheckoutSuccessMainSection.continueShoppingButton}}" stepKey="clickContinueShoppingButton"/>
-        <waitForElement selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitHomePage"/>
         <see userInput="Home Page" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeHomePageTitle"/>
         <seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}" stepKey="seeHomePageUrl"/>
 
@@ -112,7 +109,7 @@
 
         <!--Click Place Order button-->
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder3"/>
-        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage3"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage3"/>
 
         <!--Check "Print Receipt" button is presented (desktop only)-->
         <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint"/>
@@ -123,7 +120,6 @@
 
         <!--See print page-->
         <click selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="clickPrintLink"/>
-        <waitForPageLoad stepKey="waitPrintPage"/>
         <switchToWindow stepKey="switchToWindow"/>
         <switchToNextTab stepKey="switchToTab"/>
         <seeInCurrentUrl url="sales/order/print/order_id" stepKey="seePrintPage"/>
@@ -169,7 +165,7 @@
 
         <!--Click Place Order button-->
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
 
         <!--See success messages-->
         <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
@@ -181,7 +177,6 @@
         <see selector="{{CheckoutSuccessRegisterSection.customerEmail}}" userInput="Email Address: {{CustomerEntityOne.email}}" stepKey="seeCustomerEmail"/>
         <seeElement selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="seeVisibleCreateAccountButton"/>
         <click selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
-        <waitForElement selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitAccountPage"/>
         <seeInCurrentUrl url="{{StorefrontCustomerCreatePage.url}}" stepKey="seeCreateAccountPage"/>
         <see userInput="Create New Customer Account" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeCreateAccountPageTitle"/>
 
@@ -203,11 +198,10 @@
 
         <!--Click Place Order button-->
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
-        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage2"/>
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage2"/>
 
         <!--Continue shopping-->
         <click selector="{{CheckoutSuccessMainSection.continueShoppingButton}}" stepKey="clickContinueShoppingButton"/>
-        <waitForElement selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitHomePage"/>
         <seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}" stepKey="seeHomePageUrl"/>
         <see userInput="Home Page" selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="seeHomePageTitle"/>
     </test>

From 7e1e6cfbeee100984108968563bfe9d6785f9d25 Mon Sep 17 00:00:00 2001
From: Stas Puga <stas.puga@transoftgroup.com>
Date: Thu, 31 May 2018 12:16:07 +0300
Subject: [PATCH 016/127] MAGETWO-90370: Automate with MFTF Gift Options

---
 .../Checkout/Page/CheckoutCartPage.xml        |  1 +
 .../Section/CheckoutCartProductSection.xml    | 17 ++++++-----
 .../Checkout/Section/CheckoutCartSection.xml  | 29 +++++++++++++++++++
 .../Section/CheckoutCartSummarySection.xml    |  4 +--
 .../Section/CheckoutOrderSummarySection.xml   |  5 ----
 .../Section/StorefrontMiniCartSection.xml     | 11 -------
 .../Section/AdminOrderGiftOptionSection.xml   | 16 ----------
 7 files changed, 41 insertions(+), 42 deletions(-)
 create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSection.xml
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderGiftOptionSection.xml

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml
index 30e9bb0c95796..2e72571f15a2b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml
@@ -11,5 +11,6 @@
     <page name="CheckoutCartPage" url="/checkout/cart" module="Checkout" area="storefront">
         <section name="CheckoutCartProductSection"/>
         <section name="CheckoutCartSummarySection"/>
+        <section name="CheckoutCartSection"/>
     </page>
 </pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
index 76cdca91dd600..8364fd0e5783f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
@@ -26,13 +26,14 @@
                  parameterized="true"/>
         <element name="RemoveItem" type="button"
                  selector="//table[@id='shopping-cart-table']//tbody//tr[contains(@class,'item-actions')]//a[contains(@class,'action-delete')]"/>
-        <element name="giftOption" type="text" selector="//tr[contains(., '{{var1}}')]/following-sibling::*[contains(., '{{var2}}')]" parameterized="true"/>
-        <element name="giftOptionAll" type="text" selector="//div[contains(@class,'cart-gift-item')][contains(., '{{var1}}')]" parameterized="true"/>
-        <element name="clickGiftOptionsItem" type="button" selector=".gift-options-cart-item .action-gift"/>
-        <element name="clickGiftOptionsAll" type="button" selector=".gift-item-block .title span"/>
-        <element name="visibleSmallImageAll" type="text" selector=".gift-item-block .gift-options-content img"/>
-        <element name="visibleSmallImageItems" type="text" selector="#shopping-cart-table .gift-options-content img"/>
-        <element name="giftMessageAll" type="block" selector=".cart-gift-item .gift-message"/>
-        <element name="giftMessageItem" type="block" selector="#shopping-cart-table .gift-options .gift-message"/>
+        <element name="cartItemGiftOption" type="text" selector="//tr[contains(., '{{var1}}')]/following-sibling::*[contains(., '{{var2}}')]" parameterized="true"/>
+        <element name="cartGiftOptionAll" type="text" selector="//div[contains(@class,'cart-gift-item')][contains(., '{{var1}}')]" parameterized="true"/>
+        <element name="clickCartItemGiftOptions" type="button" selector=".gift-options-cart-item .action-gift"/>
+        <element name="clickCartGiftOptions" type="button" selector=".cart-gift-item div[data-role='title']"/>
+        <element name="cartVisibleSmallImage" type="text" selector=".gift-item-block .gift-options-content img"/>
+        <element name="cartItemVisibleSmallImage" type="text" selector="#shopping-cart-table .gift-options-content img"/>
+        <element name="cartGiftMessage" type="block" selector=".cart-gift-item .gift-message"/>
+        <element name="cartItemGiftMessage" type="block" selector="#shopping-cart-table .gift-options .gift-message"/>
+        <element name="cartItemClickButtonGiftUpdate" type="button" selector=".gift-options-cart-item button[type='submit']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSection.xml
new file mode 100644
index 0000000000000..77867fb3b6d01
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSection.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="CheckoutCartSection">
+        <element name="giftWrappingName" type="text" selector=".gift-wrapping-name"/>
+        <element name="giftWrappingReqularPrice" type="text" selector=".gift-wrapping-title .regular-price span"/>
+        <element name="giftRemoveButton" type="button" selector=".gift-wrapping-title .action-remove"/>
+        <element name="clickImage" type="text" selector=".gift-wrapping-preview"/>
+        <element name="clickButtonGiftUpdate" type="button" selector=".cart-gift-item .actions-toolbar button[type='submit']"/>
+        <element name="giftWrapping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals giftwrapping']//td[@class='amount']"/>
+        <element name="giftReceipt" type="text" selector=".gift-receipt label span"/>
+        <element name="giftReceiptCheckbox" type="checkbox" selector=".gift-receipt input"/>
+        <element name="giftPrintedCardCheckbox" type="checkbox" selector=".gift-printed-card input"/>
+        <element name="giftMessageTo" type="input" selector=".cart-gift-item .gift-message .gift-options-content .field-to input"/>
+        <element name="giftMessageFrom" type="input" selector=".cart-gift-item .gift-message .gift-options-content .field-from input"/>
+        <element name="giftMessage" type="textarea" selector=".cart-gift-item .gift-message .gift-options-content .text textarea"/>
+        <element name="giftWrappingNameResult" type="text" selector=".gift-summary .gift-wrapping-summary .gift-wrapping-name"/>
+        <element name="giftWrappingPriceResult" type="text" selector="//*[contains(., '{{var1}}')]/../span[@class='regular-price']//span[contains(., '{{var2}}')]" parameterized="true"/>
+        <element name="giftReceiptResult" type="text" selector=".gift-wrapping-summary span.label"/>
+        <element name="giftMessageResult" type="text" selector=".gift-message-summary"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
index c63d761b5381d..c4215649c587e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
@@ -14,7 +14,7 @@
         <element name="shipping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//td//span[@class='price']"/>
         <element name="total" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']"/>
         <element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
-        <element name="giftWrappingOrderPrice" type="text" selector="//tr[@class='totals giftwrapping']//td[@data-th='Gift Wrapping for Order']"/>
-        <element name="giftPrintedCardPrice" type="text" selector="//tr[@class='totals giftwrapping']//td[@data-th='Printed Card']"/>
+        <element name="giftWrappingOrderPrice" type="text" selector="#cart-totals td[data-th='Gift Wrapping for Order']"/>
+        <element name="giftPrintedCardPrice" type="text" selector="#cart-totals td[data-th='Printed Card']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
index b124a2de8c151..44bd86065b808 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
@@ -13,10 +13,5 @@
         <element name="productItemName" type="text" selector=".product-item-name"/>
         <element name="productItemQty" type="text" selector=".value"/>
         <element name="productItemPrice" type="text" selector=".price"/>
-        <element name="giftWrappingName" type="text" selector=".gift-wrapping-name"/>
-        <element name="giftWrappingReqularPrice" type="text" selector=".gift-wrapping-title .regular-price span"/>
-        <element name="giftRemoveButton" type="button" selector=".gift-wrapping-title .action-remove"/>
-        <element name="clickImage" type="text" selector=".gift-wrapping-preview"/>
-        <element name="clickButtonGiftUpdate" type="button" selector=".gift-options .actions-toolbar button[type='submit']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml
index 028e7ceef68c7..bdd97130a9715 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml
@@ -23,16 +23,5 @@
         <element name="viewAndEditCart" type="button" selector=".action.viewcart" timeout="30"/>
         <element name="miniCartItemsText" type="text" selector=".minicart-items"/>
         <element name="deleteMiniCartItem" type="button" selector=".action.delete" timeout="30"/>
-        <element name="giftWrapping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals giftwrapping']//td[@class='amount']"/>
-        <element name="giftReceipt" type="text" selector=".gift-receipt label span"/>
-        <element name="giftReceiptCheckbox" type="checkbox" selector=".gift-receipt input"/>
-        <element name="giftPrintedCardCheckbox" type="checkbox" selector=".gift-printed-card input"/>
-        <element name="giftMessageTo" type="input" selector=".cart-gift-item .gift-message .gift-options-content .field-to input"/>
-        <element name="giftMessageFrom" type="input" selector=".cart-gift-item .gift-message .gift-options-content .field-from input"/>
-        <element name="giftMessage" type="textarea" selector=".cart-gift-item .gift-message .gift-options-content .text textarea"/>
-        <element name="giftWrappingNameResult" type="text" selector=".gift-summary .gift-wrapping-summary .gift-wrapping-name"/>
-        <element name="giftWrappingPriceResult" type="text" selector="//*[contains(., '{{var1}}')]/../span[@class='regular-price']//span[contains(., '{{var2}}')]" parameterized="true"/>
-        <element name="giftReceiptResult" type="text" selector=".gift-wrapping-summary span.label"/>
-        <element name="giftMessageResult" type="text" selector=".gift-message-summary span"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderGiftOptionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderGiftOptionSection.xml
deleted file mode 100644
index 946f3f132e7a6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderGiftOptionSection.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-        <!--
-         /**
-          * Copyright © Magento, Inc. All rights reserved.
-          * See COPYING.txt for license details.
-          */
-        -->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminOrderGiftOptionSection">
-        <element name="giftOptionsImage" type="file" selector=".order-gift-options img"/>
-        <element name="giftWrappingDesignName" type="text" selector="//div[contains(@class, 'gift-wrapping-design')]/span"/>
-        <element name="giftWrappingDesignPrice" type="text" selector=".gift-wrapping-design #price-box span .price"/>
-    </section>
-</sections>

From 46d4116c8a7cc14a473fe23a1b22c92106404c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= <karlasaaremae@gmail.com>
Date: Thu, 31 May 2018 14:34:48 +0300
Subject: [PATCH 017/127] swatches LESS rewrite

Rewrote LESS code to suit better with Magneto Blank theme
---
 .../web/css/source/_module.less               | 576 ++++++++++--------
 1 file changed, 315 insertions(+), 261 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
index 907180eb37444..0fcee34fda688 100644
--- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
@@ -4,289 +4,343 @@
 //  */
 
 //
-//  Common
+//  Variables
 //  _____________________________________________
 
- & when (@media-common = true) {
-    .swatch-attribute-label {
-        font-weight: bold;
-        position: relative;
-    }
-
-    .swatch-attribute-label.required {
-        padding-right: 10px;
-    }
-
-    .swatch-attribute-label[data-required="1"]:after {
-        content: '*';
-        color: red;
-        position: absolute;
-        right: -11px;
-        top: -2px;
-        font-weight: bold;
-        font-size: 1em;
-    }
+@swatch-attribute-option__selected__color: #646464;
 
-    .swatch-attribute-selected-option {
-        color: #646464;
-        padding-left: 17px;
-    }
+@swatch-option__background: @color-gray94;
+@swatch-option__border: @border-width__base solid #dadada;
 
-    .swatch-attribute-options {
-        margin-top: 10px;
-    }
+@swatch-option__hover__border: @border-width__base solid @color-white;
+@swatch-option__hover__color: @color-gray20;
+@swatch-option__hover__outline: 1px solid @color-gray60;
 
-    .swatch-option {
-        padding: 1px 2px;
-        min-width: 30px;
-        max-width: 90px;
-        height: 20px;
-        float: left;
-        margin: 0 10px 5px 0;
-        text-align: center;
-        cursor: pointer;
-        position: relative;
-        border: 1px solid rgb(218, 218, 218);
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
+@swatch-option__selected__border: @swatch-option__hover__border;
+@swatch-option__selected__color: @swatch-option__hover__color;
+@swatch-option__selected__outline: 2px solid @color-orange-red1;
 
-    .swatch-option.text {
-        background: #F0F0F0;
-        color: #686868;
-        font-size: 12px;
-        font-weight: 700;
-        line-height: 20px;
-        padding: 4px 8px;
-        min-width: 22px;
-        margin-right: 7px;
-    }
-
-    .swatch-option.selected {
-        outline: 2px solid #ff5501;
-        border: 1px solid #fff;
-        color: #333;
-    }
-
-    .swatch-option.text.selected {
-        background-color: #FFF !important;
-    }
-
-    .clearfix:after {
-        content: '';
-        visibility: hidden;
-        display: block;
-        height: 0;
-        clear: both;
-    }
+@swatch-option__disabled__background: @color-red10;
 
-    .swatch-attribute.size .swatch-option,
-    .swatch-attribute.manufacturer .swatch-option {
-        background: rgb(240, 240, 240);
-        color: rgb(148, 148, 148);
-    }
+//  Text attributes
+@swatch-option-text__background: @swatch-option__background;
+@swatch-option-text__color: #686868;
 
-    .swatch-attribute.size .swatch-option.selected,
-    .swatch-attribute.manufacturer .swatch-option.selected {
-        color: black;
-        background: #fff;
-        border: 1px solid #fff;
-    }
+@swatch-option-text__selected__background-color: @color-white !important;
 
-    .swatch-option:not(.disabled):hover {
-        outline: 1px solid #999;
-        border: 1px solid #fff;
-        color: #333;
-    }
+//  Size and Manufacturer attributes
+@attr-swatch-option__background: @swatch-option__background;
+@attr-swatch-option__color: #949494;
 
-    .swatch-option.image:not(.disabled):hover,
-    .swatch-option.color:not(.disabled):hover {
-        outline: 2px solid #ee0000;
-        border: 1px solid #fff;
-    }
+@attr-swatch-option__selected__background: @color-white;
+@attr-swatch-option__selected__border: @border-width__base solid @color-white;
+@attr-swatch-option__selected__color: @color-black;
 
-    .swatch-option.disabled {
-        cursor: default;
-    }
+//  Image and Color swatch
+@img-color-swatch-option__hover__border: @swatch-option__hover__border;
+@img-color-swatch-option__hover__outline: 2px solid #ee0000;
 
-    .swatch-option.disabled:after {
-        content: '';
-        position: absolute;
-        left: 0;
-        right: 0;
-        top: 0;
-        bottom: 0;
-        background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-        background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(42%, rgba(255, 255, 255, 0)), color-stop(43%, rgba(255, 255, 255, 1)), color-stop(46%, rgba(255, 255, 255, 1)), color-stop(47%, rgba(255, 82, 22, 1)), color-stop(53%, rgba(255, 82, 22, 1)), color-stop(54%, rgba(255, 255, 255, 1)), color-stop(57%, rgba(255, 255, 255, 1)), color-stop(58%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 0)));
-        background: -webkit-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-        background: -o-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-        background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-        background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-        filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00ffffff', endColorstr='#00ffffff', GradientType=1);
-    }
+//  Tooltip
+@swatch-option-tooltip__background: @color-white;
+@swatch-option-tooltip__border: @swatch-option__border;
+@swatch-option-tooltip__color: #949494;
 
-    .swatch-option-tooltip {
-        max-width: 140px;
-        max-height: 100%;
-        min-height: 20px;
-        min-width: 20px;
-        position: absolute;
-        padding: 5px;
-        background: #fff;
-        color: rgb(148, 148, 148);
-        border: 1px solid #adadad;
-        display: none;
-        z-index: 999;
-        text-align: center;
-    }
+@swatch-option-tooltip-title__color: #282828;
 
-    .swatch-option-tooltip .corner,
-    .swatch-option-tooltip-layered .corner {
-        left: 40%;
-        position: absolute;
-        bottom: 0;
-        height: 8px;
-    }
+@swatch-option-tooltip-layered__background: @swatch-option-tooltip__background;
+@swatch-option-tooltip-layered__border: @swatch-option__border;
+@swatch-option-tooltip-layered__color: @swatch-option-tooltip__color;
 
-    .swatch-option-tooltip .corner:after,
-    .swatch-option-tooltip-layered .corner:after {
-        content: '';
-        position: relative;
-        top: 1px;
-        left: -15px;
-        width: 0;
-        height: 0;
-        border-style: solid;
-        border-width: 7px 7.5px 0 7.5px;
-        border-color: #fff transparent transparent transparent;
-        font-size: 1px;
-    }
+@swatch-option-tooltip-layered-title__color: @swatch-option-tooltip-title__color;
 
-    .swatch-option-tooltip .corner:before,
-    .swatch-option-tooltip-layered .corner:before {
-        content: '';
-        position: relative;
-        top: 2px;
-        left: 0;
-        width: 0;
-        height: 0;
-        border-style: solid;
-        border-width: 8px 8.5px 0 8.5px;
-        border-color: #adadad transparent transparent transparent;
-        font-size: 1px;
-    }
+// Layered Features
+@swatch-option-link-layered__focus__box-shadow: 0 0 3px 1px @color-sky-blue1;
 
-    .swatch-option-tooltip .image,
-    .swatch-option-tooltip-layered .image {
-        display: block;
-        height: 130px;
-        width: 130px;
-        margin: 0 auto;
-    }
-
-    .swatch-option-tooltip .title {
-        max-width: 140px;
-        min-height: 20px;
-        max-height: 200px;
-        color: rgb(40, 40, 40);
-        text-align: center;
-        display: block;
-        overflow: hidden;
-    }
-
-    .swatch-opt {
-        margin: 20px 0;
-    }
-
-    .swatch-more {
-        display: inline-block;
-        margin: 2px 0;
-        text-decoration: none !important;
-        position: static;
-        z-index: 1;
-    }
-
-    // Layered Features
-    .swatch-option-link-layered {
-        position: relative;
-        margin: 0 !important;
-        padding: 0 !important;
-    }
-
-    .swatch-option-link-layered:focus>div {
-        box-shadow: 0 0 3px 1px #68a8e0;
-    }
-
-    .swatch-option-tooltip-layered {
-        width: 140px;
-        position: absolute;
-        background: #fff;
-        color: rgb(148, 148, 148);
-        border: 1px solid #adadad;
-        display: none;
-        z-index: 999;
-        left: -47px;
-    }
-
-    .swatch-visual-tooltip-layered {
-        height: 160px;
-        top: -170px;
-    }
-
-    .swatch-textual-tooltip-layered {
-        height: 30px;
-        top: -40px;
-    }
+//
+//  Common
+//  _____________________________________________
 
-    .swatch-option-link-layered:hover>.swatch-option-tooltip-layered {
-        display: block;
-    }
+ & when (@media-common = true) {
 
-    .swatch-attribute-options .swatch-option-tooltip-layered .title {
-        width: 100%;
-        height: 20px;
-        position: absolute;
-        bottom: -5px;
-        left: 0;
-        color: rgb(40, 40, 40);
-        text-align: center;
-        margin-bottom: 10px;
+    .swatch {
+        &-attribute {
+            &-label {
+                font-weight: @font-weight__bold;
+                position: relative;
+
+                &.required {
+                    padding-right: @indent__s;
+                }
+
+                &[data-required="1"]:after {
+                    .lib-css(color, @form-field-label-asterisk__color);
+                    content: '*';
+                    position: absolute;
+                    right: -11px;
+                    top: -2px;
+                    font-weight: @font-weight__bold;
+                    font-size: @font-size__base;
+                }
+            }
+
+            &-selected-option {
+                .lib-css(color, @swatch-attribute-option__selected__color);
+                padding-left: 17px;
+            }
+
+            &-options {
+                margin-top: @indent__s;
+
+                .swatch-option-tooltip-layered .title {
+                    .lib-css(color, @swatch-option-tooltip-layered-title__color);
+                    width: 100%;
+                    height: 20px;
+                    position: absolute;
+                    bottom: -5px;
+                    left: 0;
+                    text-align: center;
+                    margin-bottom: @indent__s;
+                }
+            }
+
+            &.size,
+            &.manufacturer {
+                .swatch-option {
+                    .lib-css(background, @attr-swatch-option__background);
+                    .lib-css(color, @attr-swatch-option__color);
+
+                    &.selected {
+                        .lib-css(blackground, @attr-swatch-option__selected__background);
+                        .lib-css(border, @attr-swatch-option__selected__border);
+                        .lib-css(color, @attr-swatch-option__selected__color);  
+                    }
+                }
+            }
+        }
+
+        &-option {
+            .lib-css(border, @swatch-option__border);
+            padding: 1px 2px;
+            min-width: 30px;
+            max-width: 90px;
+            height: 20px;
+            float: left;
+            margin: 0 @indent__s @indent__xs 0;
+            text-align: center;
+            cursor: pointer;
+            position: relative;
+            overflow: hidden;
+            text-overflow: ellipsis;
+
+            &.text {
+                .lib-css(background, @swatch-option-text__background);
+                .lib-css(color, @swatch-option-text__color);
+                font-size: @font-size__s;
+                font-weight: @font-weight__bold;
+                line-height: 20px;
+                padding: 4px 8px;
+                min-width: 22px;
+                margin-right: 7px;
+
+                &.selected {
+                    .lib-css(background-color, @swatch-option-text__selected__background-color);
+                }
+            }
+
+            &.selected {
+                .lib-css(outline, @swatch-option__selected__outline);
+                .lib-css(border, @swatch-option__selected__border);
+                .lib-css(color, @swatch-option__selected__color);
+            }
+
+            &:not(.disabled):hover {
+                .lib-css(border, @swatch-option__hover__border);
+                .lib-css(color, @swatch-option__hover__color);
+                .lib-css(outline, @swatch-option__hover__outline);
+            }
+
+            &.image,
+            &.color {
+                &:not(.disabled):hover {
+                    .lib-css(border, @img-color-swatch-option__hover__border);
+                    .lib-css(outline, @img-color-swatch-option__hover__outline);
+                }
+            }
+
+            &.disabled {
+                cursor: default;
+
+                &:after {
+                    content: '';
+                    position: absolute;
+                    left: 0;
+                    right: 0;
+                    top: 0;
+                    bottom: 0;
+
+                    // ToDo: improve .lib-background-gradient() to support diagonal gradient
+                    background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(42%, rgba(255, 255, 255, 0)), color-stop(43%, rgba(255, 255, 255, 1)), color-stop(46%, rgba(255, 255, 255, 1)), color-stop(47%, rgba(255, 82, 22, 1)), color-stop(53%, rgba(255, 82, 22, 1)), color-stop(54%, rgba(255, 255, 255, 1)), color-stop(57%, rgba(255, 255, 255, 1)), color-stop(58%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 0)));
+                    background: -webkit-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: -o-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00ffffff', endColorstr='#00ffffff', GradientType=1);
+                }
+            }
+            &-disabled {
+                outline: none !important;
+                cursor: default;
+                border: 0;
+
+                &:after {
+                    .lib-css(background, @swatch-option__disabled__background);
+                    .lib-rotate(-30deg);
+                    content: '';
+                    position: absolute;
+                    width: 42px;
+                    height: 2px;
+                    z-index: 995;
+                    left: -4px;
+                    top: 10px;  
+                }
+            }
+
+            &-loading {
+                .lib-url('Magento_Swatches/images/loader-2.gif');
+                content: url("@{url}");
+            }
+
+            &-tooltip {
+                .lib-css(background, @swatch-option-tooltip__background);
+                .lib-css(border, @swatch-option-tooltip__border);
+                .lib-css(color, @swatch-option-tooltip__color);
+                max-width: 140px;
+                max-height: 100%;
+                min-height: 20px;
+                min-width: 20px;
+                position: absolute;
+                padding: @indent__xs;
+                display: none;
+                z-index: 999;
+                text-align: center;
+
+                &,
+                &-layered  {
+                    .corner {
+                        left: 40%;
+                        position: absolute;
+                        bottom: 0;
+                        height: 8px;
+
+                        &:before,
+                        &:after {
+                            content: '';
+                            position: relative;
+                            width: 0;
+                            height: 0;
+                            border-style: solid;
+                            font-size: 1px;
+                        }
+
+                        &:before {
+                            top: 2px;
+                            left: 0;
+                            border-width: 8px 8.5px 0 8.5px;
+                            border-color: #adadad transparent transparent transparent;
+                        }
+
+                        &:after {
+                            top: 1px;
+                            left: -15px;
+                            border-width: 7px 7.5px 0 7.5px;
+                            border-color: #fff transparent transparent transparent;
+                        }
+                    }
+
+                    .image {
+                        display: block;
+                        height: 130px;
+                        width: 130px;
+                        margin: 0 auto;
+                    }
+                }
+
+                &-layered {
+                    .lib-css(background, @swatch-option-tooltip-layered__background);
+                    .lib-css(border, @swatch-option-tooltip-layered__border);
+                    .lib-css(color, @swatch-option-tooltip-layered__color);
+                    width: 140px;
+                    position: absolute;
+                    display: none;
+                    z-index: 999;
+                    left: -47px;
+                }
+
+                .title {
+                    .lib-css(color, @swatch-option-tooltip-title__color);
+                    max-width: 140px;
+                    min-height: 20px;
+                    max-height: 200px;
+                    text-align: center;
+                    display: block;
+                    overflow: hidden;
+                }
+            }
+
+            &-link-layered {
+                position: relative;
+                margin: 0 !important;
+                padding: 0 !important;
+
+                &:focus > div {
+                    .lib-css(box-shadow, @swatch-option-link-layered__focus__box-shadow);
+                }
+
+                &:hover > .swatch-option-tooltip-layered {
+                    display: block;
+                }
+            }
+        }
+
+        &-opt {
+            margin: @indent__base 0;
+
+            &-listing {
+                margin-bottom: @indent__s;
+            }
+        }
+
+        &-more {
+            display: inline-block;
+            margin: 2px 0;
+            text-decoration: none !important;
+            position: static;
+            z-index: 1;
+        }
+
+        &-visual-tooltip-layered {
+            height: 160px;
+            top: -170px;
+        }
+
+        &-textual-tooltip-layered {
+            height: 30px;
+            top: -40px;
+        }
+
+        &-input {
+            left: -1000px;
+            position: absolute;
+            visibility: hidden;
+        }
     }
 
-    .swatch-option-disabled:after {
+    .clearfix:after {
         content: '';
-        position: absolute;
-        width: 42px;
-        height: 2px;
-        background: red;
-        transform: rotate(-30deg);
-        -o-transform: rotate(-30deg);
-        -moz-transform: rotate(-30deg);
-        -ms-transform: rotate(-30deg);
-        -webkit-transform: rotate(-30deg);
-        z-index: 995;
-        left: -4px;
-        top: 10px;
-    }
-
-    .swatch-option-disabled {
-        outline: none !important;
-        cursor: default;
-        border: 0;
-    }
-
-    // Bugfix for Add To Cart button
-    .swatch-opt-listing {
-        margin-bottom: 10px;
-    }
-
-    .swatch-option-loading {
-        content: url(../Magento_Swatches/images/loader-2.gif);
-    }
-
-    .swatch-input {
-        left: -1000px;
-        position: absolute;
         visibility: hidden;
+        display: block;
+        height: 0;
+        clear: both;
     }
 }

From 5822e4422213a4bacfccce41df3c8e87ccc7da1a Mon Sep 17 00:00:00 2001
From: neeta-wagento <neeta@wagento.com>
Date: Sat, 19 May 2018 14:26:44 +0530
Subject: [PATCH 018/127] resolve non-unique elements id in console error

---
 .../view/frontend/web/template/billing-address/form.html      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
index 1be754934042b..00f87d325d963 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
@@ -9,7 +9,7 @@
     <!-- ko template: getTemplate() --><!-- /ko -->
     <!--/ko-->
     <form data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
-        <fieldset id="billing-new-address-form" class="fieldset address">
+        <fieldset data-bind="attr: { id:'billing-new-address-form-'+index, value:index}" class="fieldset address">
             <!-- ko foreach: getRegion('additional-fieldsets') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
@@ -21,6 +21,6 @@
                 </label>
             </div>
             <!-- /ko -->
-        </fieldset>
+        </fieldset >
     </form>
 </div>

From 4847b463a6e1305636f99455de45f296840ee979 Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Sat, 19 May 2018 14:36:20 +0530
Subject: [PATCH 019/127] Removed extra space.

---
 .../view/frontend/web/template/billing-address/form.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
index 00f87d325d963..1568045d4a98e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
@@ -21,6 +21,6 @@
                 </label>
             </div>
             <!-- /ko -->
-        </fieldset >
+        </fieldset>
     </form>
 </div>

From 52add61eb3468dff201eb189050aa3b73e03afbc Mon Sep 17 00:00:00 2001
From: Stas Puga <stas.puga@transoftgroup.com>
Date: Mon, 4 Jun 2018 10:17:19 +0300
Subject: [PATCH 020/127] MAGETWO-90370: Automate with MFTF Gift Options

---
 .../Section/CheckoutCartProductSection.xml    |  9 ------
 .../Checkout/Section/CheckoutCartSection.xml  | 29 -------------------
 .../Section/CheckoutCartSummarySection.xml    |  2 --
 3 files changed, 40 deletions(-)
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSection.xml

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
index 8364fd0e5783f..92c10ca83a76d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
@@ -26,14 +26,5 @@
                  parameterized="true"/>
         <element name="RemoveItem" type="button"
                  selector="//table[@id='shopping-cart-table']//tbody//tr[contains(@class,'item-actions')]//a[contains(@class,'action-delete')]"/>
-        <element name="cartItemGiftOption" type="text" selector="//tr[contains(., '{{var1}}')]/following-sibling::*[contains(., '{{var2}}')]" parameterized="true"/>
-        <element name="cartGiftOptionAll" type="text" selector="//div[contains(@class,'cart-gift-item')][contains(., '{{var1}}')]" parameterized="true"/>
-        <element name="clickCartItemGiftOptions" type="button" selector=".gift-options-cart-item .action-gift"/>
-        <element name="clickCartGiftOptions" type="button" selector=".cart-gift-item div[data-role='title']"/>
-        <element name="cartVisibleSmallImage" type="text" selector=".gift-item-block .gift-options-content img"/>
-        <element name="cartItemVisibleSmallImage" type="text" selector="#shopping-cart-table .gift-options-content img"/>
-        <element name="cartGiftMessage" type="block" selector=".cart-gift-item .gift-message"/>
-        <element name="cartItemGiftMessage" type="block" selector="#shopping-cart-table .gift-options .gift-message"/>
-        <element name="cartItemClickButtonGiftUpdate" type="button" selector=".gift-options-cart-item button[type='submit']"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSection.xml
deleted file mode 100644
index 77867fb3b6d01..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSection.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="CheckoutCartSection">
-        <element name="giftWrappingName" type="text" selector=".gift-wrapping-name"/>
-        <element name="giftWrappingReqularPrice" type="text" selector=".gift-wrapping-title .regular-price span"/>
-        <element name="giftRemoveButton" type="button" selector=".gift-wrapping-title .action-remove"/>
-        <element name="clickImage" type="text" selector=".gift-wrapping-preview"/>
-        <element name="clickButtonGiftUpdate" type="button" selector=".cart-gift-item .actions-toolbar button[type='submit']"/>
-        <element name="giftWrapping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals giftwrapping']//td[@class='amount']"/>
-        <element name="giftReceipt" type="text" selector=".gift-receipt label span"/>
-        <element name="giftReceiptCheckbox" type="checkbox" selector=".gift-receipt input"/>
-        <element name="giftPrintedCardCheckbox" type="checkbox" selector=".gift-printed-card input"/>
-        <element name="giftMessageTo" type="input" selector=".cart-gift-item .gift-message .gift-options-content .field-to input"/>
-        <element name="giftMessageFrom" type="input" selector=".cart-gift-item .gift-message .gift-options-content .field-from input"/>
-        <element name="giftMessage" type="textarea" selector=".cart-gift-item .gift-message .gift-options-content .text textarea"/>
-        <element name="giftWrappingNameResult" type="text" selector=".gift-summary .gift-wrapping-summary .gift-wrapping-name"/>
-        <element name="giftWrappingPriceResult" type="text" selector="//*[contains(., '{{var1}}')]/../span[@class='regular-price']//span[contains(., '{{var2}}')]" parameterized="true"/>
-        <element name="giftReceiptResult" type="text" selector=".gift-wrapping-summary span.label"/>
-        <element name="giftMessageResult" type="text" selector=".gift-message-summary"/>
-    </section>
-</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
index c4215649c587e..df236692d0d68 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
@@ -14,7 +14,5 @@
         <element name="shipping" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//td//span[@class='price']"/>
         <element name="total" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']"/>
         <element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
-        <element name="giftWrappingOrderPrice" type="text" selector="#cart-totals td[data-th='Gift Wrapping for Order']"/>
-        <element name="giftPrintedCardPrice" type="text" selector="#cart-totals td[data-th='Printed Card']"/>
     </section>
 </sections>

From a5534bc8e748bd5da6c1700a03feee1346e416da Mon Sep 17 00:00:00 2001
From: Stas Puga <stas.puga@transoftgroup.com>
Date: Mon, 4 Jun 2018 11:38:10 +0300
Subject: [PATCH 021/127] MAGETWO-90370: Automate with MFTF Gift Options

---
 .../Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml    | 1 -
 .../Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml
index 2e72571f15a2b..30e9bb0c95796 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml
@@ -11,6 +11,5 @@
     <page name="CheckoutCartPage" url="/checkout/cart" module="Checkout" area="storefront">
         <section name="CheckoutCartProductSection"/>
         <section name="CheckoutCartSummarySection"/>
-        <section name="CheckoutCartSection"/>
     </page>
 </pages>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml
index 0c8338b898670..df8f4ed63787c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml
@@ -22,6 +22,5 @@
         <section name="AdminOrderShipmentsTabSection"/>
         <section name="AdminOrderCommentsTabSection"/>
         <section name="AdminOrderTotalSection"/>
-        <section name="AdminOrderGiftOptionSection"/>
     </page>
 </pages>
\ No newline at end of file

From 3be7c52cc7b8011bea3631ce3ab52f9e68fc843a Mon Sep 17 00:00:00 2001
From: Pieter Cappelle <pieter@newance.be>
Date: Fri, 2 Feb 2018 14:40:13 +0100
Subject: [PATCH 022/127] Allow import of empty attributes

---
 .../Model/Import/Product.php                  | 13 ++++
 .../Import/Product/Type/AbstractType.php      |  4 ++
 .../Model/Import/Product/Validator.php        |  5 ++
 .../Import/Product/Validator/Quantity.php     |  4 +-
 .../Model/Import/Product/Validator/Weight.php |  4 +-
 .../Import/Product/Validator/QuantityTest.php |  8 +++
 .../Import/Product/Validator/WeightTest.php   | 67 +++++++++++++++++++
 .../Test/Unit/Model/Import/ProductTest.php    | 22 ++++++
 .../Block/Adminhtml/Import/Edit/Form.php      | 13 ++++
 .../Magento/ImportExport/Model/Import.php     | 10 +++
 10 files changed, 148 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 4d42330cd00bf..b6c72d88f81f1 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -908,6 +908,19 @@ public function getMultipleValueSeparator()
         return Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR;
     }
 
+    /**
+     * Return empty attribute value constant
+     *
+     * @return string
+     */
+    public function getEmptyAttributeValueConstant()
+    {
+        if (!empty($this->_parameters[Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT])) {
+            return $this->_parameters[Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT];
+        }
+        return Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT;
+    }
+
     /**
      * Retrieve instance of product custom options import entity
      *
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index 17d084002926a..a944af0120f9d 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -537,6 +537,10 @@ public function clearEmptyData(array $rowData)
             if (!$attrParams['is_static'] && !isset($rowData[$attrCode])) {
                 unset($rowData[$attrCode]);
             }
+
+            if (isset($rowData[$attrCode]) && $rowData[$attrCode] === $this->_entityModel->getEmptyAttributeValueConstant()) {
+                $rowData[$attrCode] = null;
+            }
         }
         return $rowData;
     }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
index 60bfdd56a718e..a07c28b02ec82 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -188,6 +188,11 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
         if (!strlen(trim($rowData[$attrCode]))) {
             return true;
         }
+
+        if ($rowData[$attrCode] === $this->context->getEmptyAttributeValueConstant() && !$attrParams['is_required']) {
+            return true;
+        }
+
         switch ($attrParams['type']) {
             case 'varchar':
             case 'text':
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php
index 728d3e4d17621..21566c955ba2f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Quantity.php
@@ -18,7 +18,9 @@ class Quantity extends AbstractImportValidator implements RowValidatorInterface
     public function isValid($value)
     {
         $this->_clearMessages();
-        if (!empty($value['qty']) && !is_numeric($value['qty'])) {
+        if (!empty($value['qty']) && (!is_numeric($value['qty'])
+            && $value['qty'] !== $this->context->getEmptyAttributeValueConstant())
+        ) {
             $this->_addMessages(
                 [
                     sprintf(
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php
index 07d038a05d2f0..5cc91d4598701 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Weight.php
@@ -15,7 +15,9 @@ class Weight extends AbstractImportValidator implements RowValidatorInterface
     public function isValid($value)
     {
         $this->_clearMessages();
-        if (!empty($value['weight']) && (!is_numeric($value['weight']) || $value['weight'] < 0)) {
+        if (!empty($value['weight']) && (!is_numeric($value['weight']) || $value['weight'] < 0)
+            && $value['weight'] !== $this->context->getEmptyAttributeValueConstant()
+        ) {
             $this->_addMessages(
                 [
                     sprintf(
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/QuantityTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/QuantityTest.php
index 144214fd6e318..b550102cb1a15 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/QuantityTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/QuantityTest.php
@@ -7,6 +7,7 @@
 
 use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\CatalogImportExport\Model\Import\Product\Validator\Quantity;
+use Magento\ImportExport\Model\Import;
 
 /**
  * Class QuantityTest
@@ -25,6 +26,10 @@ protected function setUp()
         $contextStub = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $contextStub->expects($this->any())
+            ->method('getEmptyAttributeValueConstant')
+            ->willReturn(Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT);
+
         $contextStub->method('retrieveMessageTemplate')->willReturn(null);
         $this->quantity->init($contextStub);
     }
@@ -54,6 +59,9 @@ public function isValidDataProvider()
             [true, ['qty' => '']],
             [false, ['qty' => 'abc']],
             [false, ['qty' => true]],
+            [false, ['qty' => true]],
+            [true, ['qty' => Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT]],
+            [false, ['qty' => '__EMPTY__VALUE__TEST__']],
         ];
     }
 }
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php
new file mode 100644
index 0000000000000..823ccf5bc827d
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogImportExport\Test\Unit\Model\Import\Product\Validator;
+
+use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\CatalogImportExport\Model\Import\Product\Validator\Weight;
+use Magento\ImportExport\Model\Import;
+
+/**
+ * Class WeightTest
+ */
+class WeightTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Weight
+     */
+    private $weight;
+
+    protected function setUp()
+    {
+        $this->weight = new Weight();
+
+        $contextStub = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $contextStub->expects($this->any())
+            ->method('getEmptyAttributeValueConstant')
+            ->willReturn(Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT);
+
+        $contextStub->method('retrieveMessageTemplate')->willReturn(null);
+        $this->weight->init($contextStub);
+    }
+
+    /**
+     * @param bool $expectedResult
+     * @param array $value
+     * @dataProvider isValidDataProvider
+     */
+    public function testIsValid($expectedResult, $value)
+    {
+        $result = $this->weight->isValid($value);
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function isValidDataProvider()
+    {
+        return [
+            [true, ['weight' => 0]],
+            [true, ['weight' => 1]],
+            [true, ['weight' => 5]],
+            [false, ['weight' => -1]],
+            [false, ['weight' => -10]],
+            [true, ['weight' => '']],
+            [false, ['weight' => 'abc']],
+            [false, ['weight' => true]],
+            [false, ['weight' => true]],
+            [true, ['weight' => Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT]],
+            [false, ['weight' => '__EMPTY__VALUE__TEST__']],
+        ];
+    }
+}
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
index 9282c5cb5c02e..9d6ba88fc4a69 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -600,6 +600,28 @@ public function testGetMultipleValueSeparatorFromParameters()
         );
     }
 
+    public function testGetEmptyAttributeValueConstantDefault()
+    {
+        $this->setPropertyValue($this->importProduct, '_parameters', null);
+        $this->assertEquals(
+            Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
+            $this->importProduct->getEmptyAttributeValueConstant()
+        );
+    }
+
+    public function testGetEmptyAttributeValueConstantFromParameters()
+    {
+        $expectedSeparator = '__EMPTY__VALUE__TEST__';
+        $this->setPropertyValue($this->importProduct, '_parameters', [
+            \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT => $expectedSeparator,
+        ]);
+
+        $this->assertEquals(
+            $expectedSeparator,
+            $this->importProduct->getEmptyAttributeValueConstant()
+        );
+    }
+
     public function testDeleteProductsForReplacement()
     {
         $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
index 822795abb0b44..39d0d5c7feaee 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
@@ -174,6 +174,19 @@ protected function _prepareForm()
                     'value' => Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
                 ]
             );
+            $fieldsets[$behaviorCode]->addField(
+                $behaviorCode . \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
+                'text',
+                [
+                    'name' => \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
+                    'label' => __('Empty attribute value constant'),
+                    'title' => __('Empty attribute value constant'),
+                    'required' => true,
+                    'disabled' => true,
+                    'class' => $behaviorCode,
+                    'value' => Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT,
+                ]
+            );
             $fieldsets[$behaviorCode]->addField(
                 $behaviorCode . \Magento\ImportExport\Model\Import::FIELDS_ENCLOSURE,
                 'checkbox',
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 12f34955f81f0..b5e8220e0e9b0 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -77,6 +77,11 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     const FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR = '_import_multiple_value_separator';
 
+    /**
+     * Import empty attribute value constant.
+     */
+    const FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT = '_import_empty_attribute_value_constant';
+
     /**
      * Allow multiple values wrapping in double quotes for additional attributes.
      */
@@ -89,6 +94,11 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      */
     const DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR = ',';
 
+    /**
+     * default empty attribute value constant
+     */
+    const DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT = '__EMPTY__VALUE__';
+
     /**#@+
      * Import constants
      */

From dad61f8abcb620786b598620c5b014c4cb5851fd Mon Sep 17 00:00:00 2001
From: David Manners <dmanners87@gmail.com>
Date: Mon, 12 Mar 2018 11:46:37 +0100
Subject: [PATCH 023/127] magento-engcom/import-export-improvements#49: update
 line length of clearEmptyData if statement

Updating the formatting for the new if in clearEmptyData so that it fits the coding standards.
---
 .../Model/Import/Product/Type/AbstractType.php                | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index a944af0120f9d..285cd190c088b 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -538,7 +538,9 @@ public function clearEmptyData(array $rowData)
                 unset($rowData[$attrCode]);
             }
 
-            if (isset($rowData[$attrCode]) && $rowData[$attrCode] === $this->_entityModel->getEmptyAttributeValueConstant()) {
+            if (isset($rowData[$attrCode])
+                && $rowData[$attrCode] === $this->_entityModel->getEmptyAttributeValueConstant())
+            {
                 $rowData[$attrCode] = null;
             }
         }

From ed1a4250965c67348ded54a0ad0916f5b533c97b Mon Sep 17 00:00:00 2001
From: David Manners <dmanners87@gmail.com>
Date: Mon, 12 Mar 2018 12:48:03 +0100
Subject: [PATCH 024/127] magento-engcom/import-export-improvements#49: update
 line length of clearEmptyData if statement

---
 .../Model/Import/Product/Type/AbstractType.php                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index 285cd190c088b..dd33b94423696 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -539,8 +539,8 @@ public function clearEmptyData(array $rowData)
             }
 
             if (isset($rowData[$attrCode])
-                && $rowData[$attrCode] === $this->_entityModel->getEmptyAttributeValueConstant())
-            {
+                && $rowData[$attrCode] === $this->_entityModel->getEmptyAttributeValueConstant()
+            ) {
                 $rowData[$attrCode] = null;
             }
         }

From 93ba0ab9e50fcf4b5927e1564abec8c3cc70d278 Mon Sep 17 00:00:00 2001
From: David Manners <dmanners87@gmail.com>
Date: Mon, 9 Apr 2018 14:41:50 +0000
Subject: [PATCH 025/127] magento-engcom/import-export-improvements#49: check
 to make sure the product options match expected style  - if product options
 is equal to our new empty value constant than do not try to process it as
 normal

---
 .../CatalogImportExport/Model/Import/Product/Option.php      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index adb660dd118f9..1800efd9bef4a 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -1090,7 +1090,7 @@ protected function _getMultiRowFormat($rowData)
         // Parse custom options.
         $rowData = $this->_parseCustomOptions($rowData);
         $multiRow = [];
-        if (empty($rowData['custom_options'])) {
+        if (empty($rowData['custom_options']) || !is_array($rowData['custom_options'])) {
             return $multiRow;
         }
 
@@ -1923,7 +1923,8 @@ protected function _updateProducts(array $data)
     protected function _parseCustomOptions($rowData)
     {
         $beforeOptionValueSkuDelimiter = ';';
-        if (empty($rowData['custom_options'])) {
+        if (empty($rowData['custom_options'])
+            || $rowData['custom_options'] === \Magento\ImportExport\Model\Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT) {
             return $rowData;
         }
         $rowData['custom_options'] = str_replace(

From a557d4089aa4566c604884afdb29212fba1923d1 Mon Sep 17 00:00:00 2001
From: David Manners <dmanners87@gmail.com>
Date: Mon, 9 Apr 2018 16:00:23 +0000
Subject: [PATCH 026/127] magento-engcom/import-export-improvements#49: update
 line length to match coding standards

---
 .../CatalogImportExport/Model/Import/Product/Option.php        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index 1800efd9bef4a..b4b9a5c3e97b4 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -13,6 +13,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection as ProductOptionValueCollection;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory as ProductOptionValueCollectionFactory;
 use Magento\Store\Model\Store;
+use Magento\ImportExport\Model\Import;
 
 /**
  * Entity class which provide possibility to import product custom options
@@ -1924,7 +1925,7 @@ protected function _parseCustomOptions($rowData)
     {
         $beforeOptionValueSkuDelimiter = ';';
         if (empty($rowData['custom_options'])
-            || $rowData['custom_options'] === \Magento\ImportExport\Model\Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT) {
+            || $rowData['custom_options'] === Import::DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT) {
             return $rowData;
         }
         $rowData['custom_options'] = str_replace(

From c07aea84222c3aec2368dcbb660d9f5f3027cf09 Mon Sep 17 00:00:00 2001
From: David Manners <dmanners87@gmail.com>
Date: Wed, 6 Jun 2018 12:22:00 +0000
Subject: [PATCH 027/127] magento-engcom/import-export-improvements#49: Add
 strict type to new test case

---
 .../Test/Unit/Model/Import/Product/Validator/WeightTest.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php
index 823ccf5bc827d..78174828ae26e 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/WeightTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogImportExport\Test\Unit\Model\Import\Product\Validator;
 
 use Magento\CatalogImportExport\Model\Import\Product;

From 73e934344ed8ab094f68d4e75fe8920c7702ab77 Mon Sep 17 00:00:00 2001
From: David Manners <dmanners87@gmail.com>
Date: Wed, 6 Jun 2018 13:30:39 +0000
Subject: [PATCH 028/127] magento-engcom/import-export-improvements#49: Add
 removal of custom options via csv via constant

---
 .../CatalogImportExport/Model/Import/Product/Option.php   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index b4b9a5c3e97b4..a20f5dfb530f8 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -1236,7 +1236,13 @@ protected function _importData()
                 $multiRowData = $this->_getMultiRowFormat($rowData);
                 if (!empty($rowData[self::COLUMN_SKU]) && isset($this->_productsSkuToId[$rowData[self::COLUMN_SKU]])) {
                     $this->_rowProductId = $this->_productsSkuToId[$rowData[self::COLUMN_SKU]];
-                    if (array_key_exists('custom_options', $rowData) && trim($rowData['custom_options']) === '') {
+                    if (
+                        array_key_exists('custom_options', $rowData)
+                        && (
+                            trim($rowData['custom_options']) === ''
+                            || trim ($rowData['custom_options']) === $this->_productEntity->getEmptyAttributeValueConstant()
+                        )
+                    ) {
                         $optionsToRemove[] = $this->_rowProductId;
                     }
                 }

From 51f4ac89303ea333a0a0181e198d4d85898f1b93 Mon Sep 17 00:00:00 2001
From: David Manners <dmanners87@gmail.com>
Date: Wed, 6 Jun 2018 13:52:14 +0000
Subject: [PATCH 029/127] magento-engcom/import-export-improvements#49: Add
 failure if sku is empty value constant

---
 .../Model/Import/Product/Type/AbstractType.php             | 6 +++++-
 .../CatalogImportExport/Model/Import/Product/Validator.php | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index dd33b94423696..f233c00d98f95 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -444,7 +444,11 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
         $error = false;
         $rowScope = $this->_entityModel->getRowScope($rowData);
         if (\Magento\CatalogImportExport\Model\Import\Product::SCOPE_NULL != $rowScope
-            && !empty($rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU])
+            && (
+                !empty($rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU])
+                || $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU]
+                    !== $this->_entityModel->getEmptyAttributeValueConstant()
+            )
         ) {
             foreach ($this->_getProductAttributes($rowData) as $attrCode => $attrParams) {
                 // check value for non-empty in the case of required attribute?
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
index a07c28b02ec82..e1a6188551c0c 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -150,7 +150,12 @@ public function isRequiredAttributeValid($attrCode, array $attributeParams, arra
             $doCheck = true;
         }
 
-        return $doCheck ? isset($rowData[$attrCode]) && strlen(trim($rowData[$attrCode])) : true;
+        if ($doCheck === true) {
+            return isset($rowData[$attrCode])
+                && strlen(trim($rowData[$attrCode]))
+                && trim($rowData[$attrCode]) !== $this->context->getEmptyAttributeValueConstant();
+        }
+        return true;
     }
 
     /**

From 20094b76ab070033fc76a6194f4166ce73c304e9 Mon Sep 17 00:00:00 2001
From: David Manners <dmanners87@gmail.com>
Date: Wed, 6 Jun 2018 13:53:30 +0000
Subject: [PATCH 030/127] magento-engcom/import-export-improvements#49: Add
 failure if sku is empty value constant

---
 .../Model/Import/Product/Type/AbstractType.php              | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index f233c00d98f95..dd33b94423696 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -444,11 +444,7 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
         $error = false;
         $rowScope = $this->_entityModel->getRowScope($rowData);
         if (\Magento\CatalogImportExport\Model\Import\Product::SCOPE_NULL != $rowScope
-            && (
-                !empty($rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU])
-                || $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU]
-                    !== $this->_entityModel->getEmptyAttributeValueConstant()
-            )
+            && !empty($rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU])
         ) {
             foreach ($this->_getProductAttributes($rowData) as $attrCode => $attrParams) {
                 // check value for non-empty in the case of required attribute?

From 4b54d148183471ff7ea0890d65df0cec143bfbdc Mon Sep 17 00:00:00 2001
From: David Manners <dmanners87@gmail.com>
Date: Wed, 6 Jun 2018 15:49:17 +0000
Subject: [PATCH 031/127] magento-engcom/import-export-improvements#49: Update
 code styles in option import

---
 .../CatalogImportExport/Model/Import/Product/Option.php    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index a20f5dfb530f8..ae29fd2ef4bd4 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -1236,11 +1236,10 @@ protected function _importData()
                 $multiRowData = $this->_getMultiRowFormat($rowData);
                 if (!empty($rowData[self::COLUMN_SKU]) && isset($this->_productsSkuToId[$rowData[self::COLUMN_SKU]])) {
                     $this->_rowProductId = $this->_productsSkuToId[$rowData[self::COLUMN_SKU]];
-                    if (
-                        array_key_exists('custom_options', $rowData)
+                    if (array_key_exists('custom_options', $rowData)
                         && (
-                            trim($rowData['custom_options']) === ''
-                            || trim ($rowData['custom_options']) === $this->_productEntity->getEmptyAttributeValueConstant()
+                            trim($rowData['custom_options']) === '' ||
+                            trim($rowData['custom_options']) === $this->_productEntity->getEmptyAttributeValueConstant()
                         )
                     ) {
                         $optionsToRemove[] = $this->_rowProductId;

From c52f79506f20d53e80ff505201107bc0b9823c7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= <karlasaaremae@gmail.com>
Date: Thu, 7 Jun 2018 16:40:13 +0300
Subject: [PATCH 032/127] replaced loading gif

Replaced loading gif with Theme loader gif.
---
 .../Magento/blank/Magento_Swatches/web/css/source/_module.less | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
index 0fcee34fda688..111d4d57d6212 100644
--- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
@@ -207,8 +207,7 @@
             }
 
             &-loading {
-                .lib-url('Magento_Swatches/images/loader-2.gif');
-                content: url("@{url}");
+                .lib-css(content, @loading__background-image);
             }
 
             &-tooltip {

From b4098fe6f9ad679f00ee2e1c1ee5c45778355d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= <karlasaaremae@gmail.com>
Date: Thu, 7 Jun 2018 16:41:29 +0300
Subject: [PATCH 033/127] Deleting loader gif

Replaced with Theme loader
---
 .../Magento_Swatches/web/images/loader-2.gif     | Bin 2035 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/design/frontend/Magento/blank/Magento_Swatches/web/images/loader-2.gif

diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/images/loader-2.gif b/app/design/frontend/Magento/blank/Magento_Swatches/web/images/loader-2.gif
deleted file mode 100644
index 362e2455f4be8a5ade24c3e41131533a4bc581b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2035
zcmYk7c~nzp8i(%<Nyq{kNYDg~EMg4n2{hIe(UY(yVM`!D2%;h4!lHwMg~>2Z5+DR3
z0g+8WBmvo^6j@pd1d&CNK!K696(P#>xD=T)+S5Arl)0SgY5D%Se|-1c=XuZXecv0%
z31EB{{~b^UyaRx(t*x%Eu7!mKqtV#c*C&_D>2x{>f;Kibqobo06%_)30N8Qtx3Ho9
zf(Tz0&)?IXW&%Q2_8;H~1oU*>er@}+O!yXVoO4&tcr(?%C8lZ;5^K-5wx_%qOm&@3
zzp$FwzL~YTHB^_%cC{`VZ@B#US0YZOSZ9{O+p`-#x9OLf<hW)G1ZSabSYl7ROvHNc
z=Ri~M?0*KXPH%qPlF1d>Il0O_Repi`TA`+>_<G5W(z5c3%9~ZyH8L=qATTAIO}?eU
zB3qHzD>mmOO-=2c#TUUVC-Gl*_YB@2dN4dPI`;6<_~Qw~<kYv*GqeAEGB>}lxU~G;
z_fJ=zt*#lLzc`LD#jJ<$P>q1DKU)9F3v7Lf$MWh3CL0(2@-CCgn|BXk?nhWU2cw=F
z%4nu(%@5{{dn$z%iSO$fTEf0K;D-V6<kE{M*J4ZV^%IXf?-(j*rzdJSU5!)KjI`HJ
zA9poP-)3fG$lUJc*?RU3=eUXPmM2ZTdhRW5PwV_$VOP@1M9<yDFa2=)m^{|dc#BD$
zD=N}|IKVp^%k-cb$+G;^dq`o$zg9-!1WN5OFWx*X0*!lW;JwDIHG$z@yr%K@&w(EY
zDZGwiqiNpmvWstPNNotiUg!Fr%4pvgK+(<60fzn1@_qS=*~PwD0((FtkNsvCc_;D_
z;o9m-VUKy*lbQOU+oAftpWZBWC9i&~@BevoZA5JwHaPI%-ODF;GpxZsqmKi;03xs#
ziarC1-UV}|Ae?<T07(sWuwb=HBrXc&A^Z0^`vUnEHLrdfvh$B`2{G$kfce2^Z~*vr
z1`cQJ8)J@dNOK1_r)4NUCKA((Dl6W#Q2^`iAYprdN#1C4OFavC3t^Tpq^pmO&`W~P
z_c5Wm6thZ7%QRJ07Js^&gj~qLF32SlaydskJZ+(><MQFwo=)T1JvW6}CH7%RNzx4*
zoEGYKtVYJW9#6qm?{;*6U6aYpSvoVv{1x|m4b6hNx6>Wtf(qTcGzxl26Qoc-L=KEu
zKFBI`TAIKkoH1TU;n94=iQ{PGDbrLFxF|GEVd{FEm1(s@CIONm0Tz(VdE7WUoI_8(
z>4OuAWinMwY!x|0O+85q_CMyP)HY{DO;&;VXY1Dm@ZBv@#p`DJ=Jj+1H^OZ(w4R!B
zXq5-}ri5yo<axYu>SgRRJ4(FQ7o`z)?_Rkzqb}k9#>Y^jRr&asm>uwB2yO}G!h}nB
zRIpV~Z1Vikv##U}JJDLM6Zr>SOLa8~{JWjx&JR-TW?7Wnb412eM_Y)!rj!OXEZzkO
zC&4^S+E6+7tz^J1HOy^46RhHElxL{iNA&8S&Q0|N6H`nt@ezkXsKh_^!2hxPA*>>`
zcpIx0`+q=OKNFDXzMR@Nfr58fQMu2bJw4{&Em=P@QlOB7r|1>;e3D-U)D^8Idfd_+
z(6y&_=*{#tl1QQjOsCH1?w;xBB-+i6j=d~6z-qOj>Ozm8Z4(8`15r_VN{qJ}hCPO&
zlCUmFqS*a}DM}5xn5qGUeD4me6yPXiX$xsdp(sY{7}*3VTcjed=h!J3XtH+j-wBf~
ze*0s9-5Z9hrK<<u<3}BH8$3yvNrG-TktJWaSc><lXE2M1nq2`eiKl9fLFUBLDTgrG
z5Jhp_pnwr3-h9ZgrXvORm{>fP&JzNn)1*QGdC0y5z?P9vrYhPFoihL%ipCPsN!lJ6
z6yrwx1)9Q<kiY`Ce3EKb-|@4<BQ1=59BPhHCMRG7&E+=W#(1%7>9X47sE?e>s`<HJ
ztdn}zgo<=b7_y}#vZUjR)XFDZ*Gy&zrPIq!bDhyV%W(4H*f1GBnFZ#vcHmC|!M{&Q
z+V-+WJQrop(AOFWh)bkEDKVdNaLmr!Pkb&??Dp_^Qm(*wq-7c9Df3~+q$};Ra|A;c
zpP_C!a!Ka@fZ6gLdShUy`S@QumqiZ<KCIf?ocH;4l%UWVa;!Z77o-5>a76)8=|`5R
zt>964ws|`|;sDO?19Fz9^>yiGBp3Ffm%c``ic`*)6VA1o=ei^p#JdW$r+rCmD?{+v
zm+4A&wNa-A*`UJEn3x357ULdo=)5qSXX5?V5*$O;nzgVtV3qk*NA7ArR_j>lp7z(h
z=!5PVL<~Yn+JQa^_&^P@Jsz>Nng|*6zbY)`SB4WnT#e8p@<e0i#;1FRuarNelQ=(a
zF?Y8iyC+fQ-v{u9aWMEi9Q>~nuFsc0<Se}}9`-qZUhl0o)XjXn6v!#1V2X}>Qs2+{
z%?5|u!HWaDp|wPYco(1s6ll}5h2=wHD%TH}<#2i5B17cgX4X!xdm)7rC1T~gLpL8V
zA7B46Ky{F*Aj(T<M%o=9q+6uHxcG%=M=qIpGZndLB15wHm7eFolK1I9<>cu+JnTX|
U!z@LYDOY)vhyxTQRN~S90WwAnga7~l


From b1eece2f41e99329afd0bb682f2674c0680b258c Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Mon, 18 Jun 2018 08:50:45 -0500
Subject: [PATCH 034/127] MAGETWO-91555: Admin orders can result in a customer
 with an example email address

---
 .../Adminhtml/Order/Create/Form/Account.php     |  2 +-
 .../Magento/Sales/Model/AdminOrder/Create.php   | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index 47f74734b60fa..3623e72341a22 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -147,7 +147,7 @@ protected function _addAdditionalFormElementData(AbstractElement $element)
     {
         switch ($element->getId()) {
             case 'email':
-                $element->setRequired(0);
+                $element->setRequired(1);
                 $element->setClass('validate-email admin__control-text');
                 break;
         }
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index f34f8a681085d..07716ff8274c6 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -2012,26 +2012,13 @@ protected function _validate()
     }
 
     /**
-     * Retrieve or generate new customer email.
+     * Retrieve new customer email.
      *
      * @return string
      */
     protected function _getNewCustomerEmail()
     {
-        $email = $this->getData('account/email');
-        if (empty($email)) {
-            $host = $this->_scopeConfig->getValue(
-                self::XML_PATH_DEFAULT_EMAIL_DOMAIN,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            );
-            $account = time();
-            $email = $account . '@' . $host;
-            $account = $this->getData('account');
-            $account['email'] = $email;
-            $this->setData('account', $account);
-        }
-
-        return $email;
+        return $this->getData('account/email');
     }
 
     /**

From abcded5aee17b30b3eb5b5da98c67e9bba79858f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= <karlasaaremae@gmail.com>
Date: Sat, 16 Jun 2018 19:48:17 +0300
Subject: [PATCH 035/127] Added translation possibility for moreButtonText

---
 .../Magento/Swatches/view/frontend/web/js/swatch-renderer.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index 3fea6b7dddf14..a76f070500797 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -235,7 +235,7 @@ define([
             controlLabelId: '',
 
             // text for more button
-            moreButtonText: 'More',
+            moreButtonText: $t('More'),
 
             // Callback url for media
             mediaCallback: '',

From 062024cea8e6be34256ff60ca84d9d1c8adfce62 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Wed, 20 Jun 2018 14:18:07 +0300
Subject: [PATCH 036/127] MAGETWO-92883: Category hierarchy isn't updated on
 Product Admin page

---
 .../Adminhtml/Category/RefreshPath.php        |   6 +-
 .../Controller/Adminhtml/Category/Save.php    |   3 +
 .../Adminhtml/Category/RefreshPathTest.php    | 147 ++++++++++++++++++
 .../adminhtml/web/catalog/category/form.js    |   2 +
 4 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
index 962cd52d39338..f06a8bd29a5c6 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
@@ -38,7 +38,11 @@ public function execute()
 
             /** @var \Magento\Framework\Controller\Result\Json $resultJson */
             $resultJson = $this->resultJsonFactory->create();
-            return $resultJson->setData(['id' => $categoryId, 'path' => $category->getPath()]);
+            return $resultJson->setData([
+                'id' => $categoryId,
+                'path' => $category->getPath(),
+                'parentId' => $category->getParentID(),
+            ]);
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index bcc7d468fd0f4..cc03ab870739b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -139,6 +139,9 @@ public function execute()
         $parentId = isset($categoryPostData['parent']) ? $categoryPostData['parent'] : null;
         if ($categoryPostData) {
             $category->addData($categoryPostData);
+            if ($parentId) {
+                $category->setParentId($parentId);
+            }
             if ($isNewCategory) {
                 $parentCategory = $this->getParentCategory($parentId, $storeId);
                 $category->setPath($parentCategory->getPath());
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
new file mode 100644
index 0000000000000..c26ed1013fde1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Category;
+
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Catalog\Controller\Adminhtml\Category\RefreshPath;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Test for class RefreshPath.
+ */
+class RefreshPathTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var JsonFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultJsonFactoryMock;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function setUp()
+    {
+        $this->resultJsonFactoryMock = $this->getMockBuilder(JsonFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create', 'setData'])
+            ->getMock();
+
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getRequest'])
+            ->getMock();
+    }
+
+    /**
+     * Sets object non-public property.
+     *
+     * @param mixed $object
+     * @param string $propertyName
+     * @param mixed $value
+     *
+     * @return void
+     */
+    private function setObjectProperty($object, string $propertyName, $value)
+    {
+        $reflectionClass = new \ReflectionClass($object);
+        $reflectionProperty = $reflectionClass->getProperty($propertyName);
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($object, $value);
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecute()
+    {
+        $value = ['id' => 3, 'path' => '1/2/3', 'parentId' => 2];
+        $result = '{"id":3,"path":"1/2/3","parentId":"2"}';
+
+        $requestMock = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
+
+        $refreshPath = $this->getMockBuilder(RefreshPath::class)
+            ->setMethods(['getRequest', 'create'])
+            ->setConstructorArgs([
+                $this->contextMock,
+                $this->resultJsonFactoryMock,
+            ])->getMock();
+
+        $refreshPath->expects($this->any())->method('getRequest')->willReturn($requestMock);
+        $requestMock->expects($this->any())->method('getParam')->with('id')->willReturn($value['id']);
+
+        $categoryMock = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getPath', 'getParentID', 'getResource'])
+            ->getMock();
+
+        $categoryMock->expects($this->any())->method('getPath')->willReturn($value['path']);
+        $categoryMock->expects($this->any())->method('getParentID')->willReturn($value['parentId']);
+
+        $categoryResource = $this->createMock(\Magento\Catalog\Model\ResourceModel\Category::class);
+
+        $objectManagerMock = $this->getMockBuilder(ObjectManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->setObjectProperty($refreshPath, '_objectManager', $objectManagerMock);
+        $this->setObjectProperty($categoryMock, '_resource', $categoryResource);
+
+        $objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with(\Magento\Catalog\Model\Category::class)
+            ->willReturn($categoryMock);
+
+        $this->resultJsonFactoryMock->expects($this->any())->method('create')->willReturnSelf();
+        $this->resultJsonFactoryMock->expects($this->any())
+            ->method('setData')
+            ->with($value)
+            ->willReturn($result);
+
+        $this->assertEquals($result, $refreshPath->execute());
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithoutCategoryId()
+    {
+        $requestMock = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
+
+        $refreshPath = $this->getMockBuilder(RefreshPath::class)
+            ->setMethods(['getRequest', 'create'])
+            ->setConstructorArgs([
+                $this->contextMock,
+                $this->resultJsonFactoryMock,
+            ])->getMock();
+
+        $refreshPath->expects($this->any())->method('getRequest')->willReturn($requestMock);
+        $requestMock->expects($this->any())->method('getParam')->with('id')->willReturn(null);
+
+        $objectManagerMock = $this->getMockBuilder(ObjectManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->setObjectProperty($refreshPath, '_objectManager', $objectManagerMock);
+
+        $objectManagerMock->expects($this->never())
+            ->method('create')
+            ->with(\Magento\Catalog\Model\Category::class)
+            ->willReturnSelf();
+
+        $refreshPath->execute();
+    }
+}
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
index 0f6689b88db06..0a04358e41123 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
@@ -14,6 +14,7 @@ define([
             options: {
                 categoryIdSelector: 'input[name="id"]',
                 categoryPathSelector: 'input[name="path"]',
+                categoryParentSelector: 'input[name="parent"]',
                 refreshUrl: config.refreshUrl
             },
 
@@ -45,6 +46,7 @@ define([
                 } else {
                     $(this.options.categoryIdSelector).val(data.id).change();
                     $(this.options.categoryPathSelector).val(data.path).change();
+                    $(this.options.categoryParentSelector).val(data.parentId).change();
                 }
             }
         };

From eb42deabb49e091e400c517bf609fbeaa86eb86a Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 20 Jun 2018 16:11:27 +0300
Subject: [PATCH 037/127] MAGETWO-92884: Shipping page contains the equal
 shipping addresses after adding a user.

---
 .../Model/Order/OrderCustomerExtractor.php    | 64 +++++++++++--------
 .../OrderCustomerDelegateInterfaceTest.php    | 54 ++++++++++++++++
 .../_files/order_different_addresses.php      | 62 ++++++++++++++++++
 3 files changed, 153 insertions(+), 27 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_different_addresses.php

diff --git a/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php b/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php
index 2a93f389e569f..21ea9a394465d 100644
--- a/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php
+++ b/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php
@@ -14,10 +14,10 @@
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\RegionInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory as AddressFactory;
-use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Customer\Api\Data\RegionInterfaceFactory as RegionFactory;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory as CustomerFactory;
 use Magento\Quote\Api\Data\AddressInterfaceFactory as QuoteAddressFactory;
+use Magento\Sales\Model\Order\Address as OrderAddress;
 
 /**
  * Extract customer data from an order.
@@ -87,8 +87,9 @@ public function __construct(
     }
 
     /**
-     * @param int $orderId
+     * Extract customer data from order.
      *
+     * @param int $orderId
      * @return CustomerInterface
      */
     public function extract(int $orderId): CustomerInterface
@@ -107,36 +108,45 @@ public function extract(int $orderId): CustomerInterface
             $order->getBillingAddress(),
             []
         );
-        $addresses = $order->getAddresses();
-        foreach ($addresses as $address) {
-            $addressData = $this->objectCopyService->copyFieldsetToTarget(
-                'order_address',
-                'to_customer_address',
-                $address,
-                []
-            );
-            /** @var AddressInterface $customerAddress */
-            $customerAddress = $this->addressFactory->create(['data' => $addressData]);
-            switch ($address->getAddressType()) {
-                case QuoteAddress::ADDRESS_TYPE_BILLING:
-                    $customerAddress->setIsDefaultBilling(true);
-                    break;
-                case QuoteAddress::ADDRESS_TYPE_SHIPPING:
-                    $customerAddress->setIsDefaultShipping(true);
-                    break;
+
+        $processedAddressData = [];
+        $customerAddresses = [];
+        foreach ($order->getAddresses() as $orderAddress) {
+            $addressData = $this->objectCopyService
+                ->copyFieldsetToTarget('order_address', 'to_customer_address', $orderAddress, []);
+
+            $index = array_search($addressData, $processedAddressData);
+            if ($index === false) {
+                // create new customer address only if it is unique
+                $customerAddress = $this->addressFactory->create(['data' => $addressData]);
+                $customerAddress->setIsDefaultBilling(false);
+                $customerAddress->setIsDefaultBilling(false);
+                if (is_string($orderAddress->getRegion())) {
+                    /** @var RegionInterface $region */
+                    $region = $this->regionFactory->create();
+                    $region->setRegion($orderAddress->getRegion());
+                    $region->setRegionCode($orderAddress->getRegionCode());
+                    $region->setRegionId($orderAddress->getRegionId());
+                    $customerAddress->setRegion($region);
+                }
+
+                $processedAddressData[] = $addressData;
+                $customerAddresses[] = $customerAddress;
+                $index = count($processedAddressData) - 1;
             }
 
-            if (is_string($address->getRegion())) {
-                /** @var RegionInterface $region */
-                $region = $this->regionFactory->create();
-                $region->setRegion($address->getRegion());
-                $region->setRegionCode($address->getRegionCode());
-                $region->setRegionId($address->getRegionId());
-                $customerAddress->setRegion($region);
+            $customerAddress = $customerAddresses[$index];
+            // make sure that address type flags from equal addresses are stored in one resulted address
+            if ($orderAddress->getAddressType() == OrderAddress::TYPE_BILLING) {
+                $customerAddress->setIsDefaultBilling(true);
+            }
+            if ($orderAddress->getAddressType() == OrderAddress::TYPE_SHIPPING) {
+                $customerAddress->setIsDefaultShipping(true);
             }
-            $customerData['addresses'][] = $customerAddress;
         }
 
+        $customerData['addresses'] = $customerAddresses;
+
         return $this->customerFactory->create(['data' => $customerData]);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php
index 459e8fdbf5087..6e7eb8f8f0511 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php
@@ -159,6 +159,60 @@ public function testDelegateNew(): void
             '12345abcD'
         );
 
+        //Testing that addresses from order and the order itself are assigned
+        //to customer.
+        $order = $this->orderRepository->get($orderId);
+        $this->assertCount(1, $createdCustomer->getAddresses());
+        $this->assertNotNull($createdCustomer->getDefaultBilling());
+        $this->assertNotNull($createdCustomer->getDefaultShipping());
+        foreach ($createdCustomer->getAddresses() as $address) {
+            $this->assertTrue(
+                $address->isDefaultBilling() || $address->isDefaultShipping()
+            );
+            if ($address->isDefaultBilling()) {
+                $this->compareAddresses($order->getBillingAddress(), $address);
+            } elseif ($address->isDefaultShipping()) {
+                $this->compareAddresses($order->getShippingAddress(), $address);
+            }
+        }
+        $this->assertEquals($order->getCustomerId(), $createdCustomer->getId());
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/order_different_addresses.php
+     */
+    public function testDelegateNewDifferentAddresses()
+    {
+        $orderAutoincrementId = '100000001';
+        /** @var Order $orderModel */
+        $orderModel = $this->orderFactory->create();
+        $orderModel->loadByIncrementId($orderAutoincrementId);
+        $orderId = $orderModel->getId();
+        unset($orderModel);
+
+        $this->delegate->delegateNew($orderId);
+
+        //Saving new customer with prepared data from order.
+        /** @var CustomerInterface $customer */
+        $customer = $this->customerFactory->create();
+        $customer->setWebsiteId(1)
+            ->setEmail('customer_order_delegate@example.com')
+            ->setGroupId(1)
+            ->setStoreId(1)
+            ->setPrefix('Mr.')
+            ->setFirstname('John')
+            ->setMiddlename('A')
+            ->setLastname('Smith')
+            ->setSuffix('Esq.')
+            ->setTaxvat('12')
+            ->setGender(0);
+        $createdCustomer = $this->accountManagement->createAccount(
+            $customer,
+            '12345abcD'
+        );
+
         //Testing that addresses from order and the order itself are assigned
         //to customer.
         $order = $this->orderRepository->get($orderId);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_different_addresses.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_different_addresses.php
new file mode 100644
index 0000000000000..cbbe1edb5fb5e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_different_addresses.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+require 'default_rollback.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+/** @var \Magento\Catalog\Model\Product $product */
+
+$addressData = include __DIR__ . '/address_data.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Sales\Model\Order\Address $billingAddress */
+$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+/** @var \Magento\Sales\Model\Order\Address $shippingAddress */
+$shippingAddress = clone $billingAddress;
+$shippingAddress
+    ->setId(null)
+    ->setAddressType('shipping')
+    ->setCity('San Francisco');
+
+/** @var \Magento\Sales\Model\Order\Payment $payment */
+$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+$payment->setMethod('checkmo');
+$payment->setAdditionalInformation('last_trans_id', '11122');
+$payment->setAdditionalInformation('metadata', [
+    'type' => 'free',
+    'fraudulent' => false,
+]);
+
+/** @var \Magento\Sales\Model\Order\Item $orderItem */
+$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+$orderItem->setProductId($product->getId())->setQtyOrdered(2);
+$orderItem->setBasePrice($product->getPrice());
+$orderItem->setPrice($product->getPrice());
+$orderItem->setRowTotal($product->getPrice());
+$orderItem->setProductType('simple');
+
+/** @var \Magento\Sales\Model\Order $order */
+$order = $objectManager->create(\Magento\Sales\Model\Order::class);
+$order->setIncrementId('100000001')
+    ->setState(\Magento\Sales\Model\Order::STATE_PROCESSING)
+    ->setStatus($order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING))
+    ->setSubtotal(100)
+    ->setGrandTotal(100)
+    ->setBaseSubtotal(100)
+    ->setBaseGrandTotal(100)
+    ->setCustomerIsGuest(true)
+    ->setCustomerEmail('customer@null.com')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setStoreId($objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId())
+    ->addItem($orderItem)
+    ->setPayment($payment);
+
+$order->save();

From 40e324cc4be6c05321055db6a885a65d3f8a8989 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 20 Jun 2018 17:19:30 +0300
Subject: [PATCH 038/127] MAGETWO-92884: Shipping page contains the equal
 shipping addresses after adding a user.

---
 .../Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php | 5 +++--
 .../Magento/Sales/_files/order_different_addresses.php       | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php
index 6e7eb8f8f0511..cb6f4aaac07d3 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php
@@ -182,14 +182,15 @@ public function testDelegateNew(): void
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/order_different_addresses.php
+     * @return void
      */
-    public function testDelegateNewDifferentAddresses()
+    public function testDelegateNewDifferentAddresses(): void
     {
         $orderAutoincrementId = '100000001';
         /** @var Order $orderModel */
         $orderModel = $this->orderFactory->create();
         $orderModel->loadByIncrementId($orderAutoincrementId);
-        $orderId = $orderModel->getId();
+        $orderId = (int)$orderModel->getId();
         unset($orderModel);
 
         $this->delegate->delegateNew($orderId);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_different_addresses.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_different_addresses.php
index cbbe1edb5fb5e..d2be07b1e097f 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_different_addresses.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_different_addresses.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 // @codingStandardsIgnoreFile
 

From 5e9bee00f063f0acbf30f731d27281b191a07e15 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Thu, 21 Jun 2018 09:16:50 +0300
Subject: [PATCH 039/127] MAGETWO-92883: Category hierarchy isn't updated on
 Product Admin page

---
 .../Unit/Controller/Adminhtml/Category/RefreshPathTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
index c26ed1013fde1..437d59754d69a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
@@ -64,7 +64,7 @@ private function setObjectProperty($object, string $propertyName, $value)
     /**
      * @return void
      */
-    public function testExecute()
+    public function testExecute() : void
     {
         $value = ['id' => 3, 'path' => '1/2/3', 'parentId' => 2];
         $result = '{"id":3,"path":"1/2/3","parentId":"2"}';
@@ -116,7 +116,7 @@ public function testExecute()
     /**
      * @return void
      */
-    public function testExecuteWithoutCategoryId()
+    public function testExecuteWithoutCategoryId() : void
     {
         $requestMock = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
 

From 6cc4b990eb2396fdeffd93c7b6026a3f1e095604 Mon Sep 17 00:00:00 2001
From: Stas Puga <stas.puga@transoftgroup.com>
Date: Thu, 21 Jun 2018 13:38:03 +0300
Subject: [PATCH 040/127] MAGETWO-90370: Automate with MFTF Gift Options

---
 .../FunctionalTest/Catalog/Section/AdminProductGridSection.xml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
index e4f571f7f0d83..23f5d5adc1cf2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
@@ -26,5 +26,6 @@
         <element name="table" type="text" selector="#container > div > div.admin__data-grid-wrap > table"/>
         <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
         <element name="productGridCheckboxOnRow" type="checkbox" selector="//*[@id='container']//tr[{{row}}]/td[1]//input" parameterized="true"/>
+        <element name="productGridNameProduct" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
     </section>
 </sections>

From 0c97e638aebe608d9242a51a15c109078ae8ba57 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Thu, 21 Jun 2018 13:44:26 +0300
Subject: [PATCH 041/127] MAGETWO-92883: Category hierarchy isn't updated on
 Product Admin page

---
 .../Unit/Controller/Adminhtml/Category/RefreshPathTest.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
index 437d59754d69a..0a50ae0b9accf 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
@@ -14,7 +14,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
- * Test for class RefreshPath.
+ * Test for class Magento\Catalog\Controller\Adminhtml\Category\RefreshPath.
  */
 class RefreshPathTest extends \PHPUnit\Framework\TestCase
 {
@@ -29,7 +29,7 @@ class RefreshPathTest extends \PHPUnit\Framework\TestCase
     private $contextMock;
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     protected function setUp()
     {
@@ -53,7 +53,7 @@ protected function setUp()
      *
      * @return void
      */
-    private function setObjectProperty($object, string $propertyName, $value)
+    private function setObjectProperty($object, string $propertyName, $value) : void
     {
         $reflectionClass = new \ReflectionClass($object);
         $reflectionProperty = $reflectionClass->getProperty($propertyName);

From d78e604336128a2709ad5deb2a68b772e55e8d8a Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Thu, 21 Jun 2018 15:29:28 +0300
Subject: [PATCH 042/127] MAGETWO-92883: Category hierarchy isn't updated on
 Product Admin page

---
 .../Catalog/Controller/Adminhtml/Category/RefreshPath.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
index f06a8bd29a5c6..9384397b67f93 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
@@ -41,7 +41,7 @@ public function execute()
             return $resultJson->setData([
                 'id' => $categoryId,
                 'path' => $category->getPath(),
-                'parentId' => $category->getParentID(),
+                'parentId' => $category->getParentId(),
             ]);
         }
     }

From 292a4853a7739eabc28df1d832cc7deecc6249cf Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Thu, 21 Jun 2018 15:43:03 +0300
Subject: [PATCH 043/127] MAGETWO-92883: Category hierarchy isn't updated on
 Product Admin page

---
 .../Unit/Controller/Adminhtml/Category/RefreshPathTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
index 0a50ae0b9accf..45de62e218cfc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
@@ -83,11 +83,11 @@ public function testExecute() : void
 
         $categoryMock = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getPath', 'getParentID', 'getResource'])
+            ->setMethods(['getPath', 'getParentId', 'getResource'])
             ->getMock();
 
         $categoryMock->expects($this->any())->method('getPath')->willReturn($value['path']);
-        $categoryMock->expects($this->any())->method('getParentID')->willReturn($value['parentId']);
+        $categoryMock->expects($this->any())->method('getParentId')->willReturn($value['parentId']);
 
         $categoryResource = $this->createMock(\Magento\Catalog\Model\ResourceModel\Category::class);
 

From 48176321065ac51121d35ecb5aa5bcff3b1c4698 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Thu, 21 Jun 2018 16:48:55 +0300
Subject: [PATCH 044/127] MAGETWO-88645: Error while deleting a Product Image

---
 .../Magento/Catalog/Model/Product/Gallery/UpdateHandler.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
index 53083d7168b45..8ad8dcb4812e4 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
@@ -32,6 +32,9 @@ protected function processDeletedImages($product, array &$images)
         foreach ($images as &$image) {
             if (!empty($image['removed'])) {
                 if (!empty($image['value_id']) && !isset($picturesInOtherStores[$image['file']])) {
+                    if (preg_match('/\.\.(\\\|\/)/', $image['file'])) {
+                        continue;
+                    }
                     $recordsToDelete[] = $image['value_id'];
                     $catalogPath = $this->mediaConfig->getBaseMediaPath();
                     $isFile = $this->mediaDirectory->isFile($catalogPath . $image['file']);

From fcfc381bbf81246c2e015dd7fdb7e40233e8a1f7 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com>
Date: Fri, 22 Jun 2018 11:24:43 +0300
Subject: [PATCH 045/127] MAGETWO-90070: Image uploader improvements

---
 .../Magento/Catalog/Model/ImageUploader.php   |  17 +-
 .../Test/Unit/Model/ImageUploaderTest.php     |   7 +
 .../Cms/Model/Wysiwyg/Images/Storage.php      |  39 ++++-
 .../Unit/Model/Wysiwyg/Images/StorageTest.php | 153 ++++++++++++++---
 app/code/Magento/Cms/etc/di.xml               |  28 ++--
 .../Magento/Mtf/Util/Command/Cli/Queue.php    |   2 +-
 .../Magento/Mtf/Util/Command/Cli/Setup.php    |   9 +-
 dev/tests/functional/utils/command.php        |  33 ++--
 .../Catalog/Model/ImageUploaderTest.php       | 138 ++++++++++++++++
 .../Cms/Model/Wysiwyg/Images/StorageTest.php  | 154 +++++++++++++-----
 lib/internal/Magento/Framework/File/Mime.php  |  62 ++++++-
 .../File/Test/Unit/_files/UPPERCASE.WEIRD     |   1 +
 .../File/Test/Unit/_files/file.weird          |   1 +
 .../Magento/Framework/File/Uploader.php       |  15 +-
 14 files changed, 536 insertions(+), 123 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php

diff --git a/app/code/Magento/Catalog/Model/ImageUploader.php b/app/code/Magento/Catalog/Model/ImageUploader.php
index 6aa76ca8c1e43..0c60e5b38a96e 100644
--- a/app/code/Magento/Catalog/Model/ImageUploader.php
+++ b/app/code/Magento/Catalog/Model/ImageUploader.php
@@ -64,6 +64,18 @@ class ImageUploader
      */
     protected $allowedExtensions;
 
+    /**
+     * List of allowed image mime types
+     *
+     * @var array
+     */
+    private $allowedMimeTypes = [
+        'image/jpg',
+        'image/jpeg',
+        'image/gif',
+        'image/png',
+    ];
+
     /**
      * ImageUploader constructor
      *
@@ -218,6 +230,7 @@ public function moveFileFromTmp($imageName)
      * @return string[]
      *
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Exception
      */
     public function saveFileToTmpDir($fileId)
     {
@@ -227,7 +240,9 @@ public function saveFileToTmpDir($fileId)
         $uploader = $this->uploaderFactory->create(['fileId' => $fileId]);
         $uploader->setAllowedExtensions($this->getAllowedExtensions());
         $uploader->setAllowRenameFiles(true);
-
+        if (!$uploader->checkMimeType($this->allowedMimeTypes)) {
+            throw new \Magento\Framework\Exception\LocalizedException(__('File validation failed.'));
+        }
         $result = $uploader->save($this->mediaDirectory->getAbsolutePath($baseTmpPath));
         unset($result['path']);
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php
index b8196fcd8bea3..c989f2dd47462 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ImageUploaderTest.php
@@ -114,6 +114,12 @@ protected function setUp()
     public function testSaveFileToTmpDir()
     {
         $fileId = 'file.jpg';
+        $allowedMimeTypes = [
+            'image/jpg',
+            'image/jpeg',
+            'image/gif',
+            'image/png',
+        ];
         /** @var \Magento\MediaStorage\Model\File\Uploader|\PHPUnit_Framework_MockObject_MockObject $uploader */
         $uploader = $this->createMock(\Magento\MediaStorage\Model\File\Uploader::class);
         $this->uploaderFactoryMock->expects($this->once())->method('create')->willReturn($uploader);
@@ -123,6 +129,7 @@ public function testSaveFileToTmpDir()
             ->willReturn($this->basePath);
         $uploader->expects($this->once())->method('save')->with($this->basePath)
             ->willReturn(['tmp_name' => $this->baseTmpPath, 'file' => $fileId, 'path' => $this->basePath]);
+        $uploader->expects($this->atLeastOnce())->method('checkMimeType')->with($allowedMimeTypes)->willReturn(true);
         $storeMock = $this->createPartialMock(
             \Magento\Store\Model\Store::class,
             ['getBaseUrl']
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index 4b7cd239a66f5..1ba6e5be5bcb6 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -478,6 +478,7 @@ public function deleteFile($target)
      * @param string $type Type of storage, e.g. image, media etc.
      * @return array File info Array
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Exception
      */
     public function uploadFile($targetPath, $type = null)
     {
@@ -489,6 +490,9 @@ public function uploadFile($targetPath, $type = null)
         }
         $uploader->setAllowRenameFiles(true);
         $uploader->setFilesDispersion(false);
+        if (!$uploader->checkMimeType($this->getAllowedMimeTypes($type))) {
+            throw new \Magento\Framework\Exception\LocalizedException(__('File validation failed.'));
+        }
         $result = $uploader->save($targetPath);
 
         if (!$result) {
@@ -645,11 +649,7 @@ public function getSession()
      */
     public function getAllowedExtensions($type = null)
     {
-        if (is_string($type) && array_key_exists("{$type}_allowed", $this->_extensions)) {
-            $allowed = $this->_extensions["{$type}_allowed"];
-        } else {
-            $allowed = $this->_extensions['allowed'];
-        }
+        $allowed = $this->getExtensionsList($type);
 
         return array_keys(array_filter($allowed));
     }
@@ -755,4 +755,33 @@ protected function _getRelativePathToRoot($path)
             strlen($this->_sanitizePath($this->_cmsWysiwygImages->getStorageRoot()))
         );
     }
+
+    /**
+     * Prepare mime types config settings
+     *
+     * @param string|null $type Type of storage, e.g. image, media etc.
+     * @return array Array of allowed file extensions
+     */
+    private function getAllowedMimeTypes($type = null): array
+    {
+        $allowed = $this->getExtensionsList($type);
+
+        return array_values(array_filter($allowed));
+    }
+
+    /**
+     * Get list of allowed file extensions with mime type in values
+     *
+     * @param string|null $type
+     * @return array
+     */
+    private function getExtensionsList($type = null): array
+    {
+        if (is_string($type) && array_key_exists("{$type}_allowed", $this->_extensions)) {
+            $allowed = $this->_extensions["{$type}_allowed"];
+        } else {
+            $allowed = $this->_extensions['allowed'];
+        }
+        return $allowed;
+    }
 }
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
index 25134451d5a56..6b24db3141030 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
@@ -107,6 +107,13 @@ class StorageTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManagerHelper;
 
+    private $allowedImageExtensions = [
+        'jpg' => 'image/jpg',
+        'jpeg' => 'image/jpeg',
+        'png' => 'image/png',
+        'gif' => 'image/png',
+    ];
+
     /**
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -120,7 +127,7 @@ protected function setUp()
 
         $this->directoryMock = $this->createPartialMock(
             \Magento\Framework\Filesystem\Directory\Write::class,
-            ['delete', 'getDriver', 'create', 'getRelativePath', 'isExist']
+            ['delete', 'getDriver', 'create', 'getRelativePath', 'isExist', 'isFile']
         );
         $this->directoryMock->expects(
             $this->any()
@@ -176,7 +183,16 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->sessionMock = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
-            ->setMethods(['getCurrentPath'])
+            ->setMethods(
+                [
+                    'getCurrentPath',
+                    'getName',
+                    'getSessionId',
+                    'getCookieLifetime',
+                    'getCookiePath',
+                    'getCookieDomain',
+                ]
+            )
             ->disableOriginalConstructor()
             ->getMock();
         $this->backendUrlMock = $this->createMock(\Magento\Backend\Model\Url::class);
@@ -184,6 +200,10 @@ protected function setUp()
         $this->coreFileStorageMock = $this->getMockBuilder(\Magento\MediaStorage\Helper\File\Storage\Database::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $allowedExtensions = [
+            'allowed' => $this->allowedImageExtensions,
+            'image_allowed' => $this->allowedImageExtensions,
+        ];
 
         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
@@ -205,8 +225,9 @@ protected function setUp()
                 'resizeParameters' => $this->resizeParameters,
                 'dirs' => [
                     'exclude' => [],
-                    'include' => []
-                ]
+                    'include' => [],
+                ],
+                'extensions' => $allowedExtensions,
             ]
         );
     }
@@ -232,8 +253,8 @@ public function testGetResizeHeight()
      */
     public function testDeleteDirectoryOverRoot()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage(
+        $this->expectException(
+            \Magento\Framework\Exception\LocalizedException::class,
             sprintf('Directory %s is not under storage root path.', self::INVALID_DIRECTORY_OVER_ROOT)
         );
         $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
@@ -245,8 +266,10 @@ public function testDeleteDirectoryOverRoot()
      */
     public function testDeleteRootDirectory()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage(sprintf('We can\'t delete root directory %s right now.', self::STORAGE_ROOT_DIR));
+        $this->expectException(
+            \Magento\Framework\Exception\LocalizedException::class,
+            sprintf('We can\'t delete root directory %s right now.', self::STORAGE_ROOT_DIR)
+        );
         $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
         $this->imagesStorage->deleteDirectory(self::STORAGE_ROOT_DIR);
     }
@@ -302,8 +325,8 @@ public function testGetDirsCollection($exclude, $include, $fileNames, $expectedR
                 'resizeParameters' => $this->resizeParameters,
                 'dirs' => [
                     'exclude' => $exclude,
-                    'include' => $include
-                ]
+                    'include' => $include,
+                ],
             ]
         );
 
@@ -328,11 +351,11 @@ public function dirsCollectionDataProvider()
         return [
             [
                 'exclude' => [
-                    ['name' => 'dress']
+                    ['name' => 'dress'],
                 ],
                 'include' => [],
                 'filenames' => [],
-                'expectRemoveKeys' => []
+                'expectRemoveKeys' => [],
             ],
             [
                 'exclude' => [],
@@ -340,36 +363,36 @@ public function dirsCollectionDataProvider()
                 'filenames' => [
                     '/dress',
                 ],
-                'expectRemoveKeys' => []
+                'expectRemoveKeys' => [],
             ],
             [
                 'exclude' => [
-                    ['name' => 'dress']
+                    ['name' => 'dress'],
                 ],
                 'include' => [],
                 'filenames' => [
                     '/collection',
                 ],
-                'expectRemoveKeys' => []
+                'expectRemoveKeys' => [],
             ],
             [
                 'exclude' => [
                     ['name' => 'gear', 'regexp' => 1],
                     ['name' => 'home', 'regexp' => 1],
                     ['name' => 'collection'],
-                    ['name' => 'dress']
+                    ['name' => 'dress'],
                 ],
                 'include' => [
                     ['name' => 'home', 'regexp' => 1],
-                    ['name' => 'collection']
+                    ['name' => 'collection'],
                 ],
                 'filenames' => [
                     '/dress',
                     '/collection',
-                    '/gear'
+                    '/gear',
                 ],
-                'expectRemoveKeys' => [[0], [2]]
-            ]
+                'expectRemoveKeys' => [[0], [2]],
+            ],
         ];
     }
 
@@ -411,4 +434,94 @@ protected function generalTestGetDirsCollection($path, $collectionArray = [], $e
 
         $this->imagesStorage->getDirsCollection($path);
     }
+
+    public function testUploadFile()
+    {
+        $targetPath = '/target/path';
+        $fileName = 'image.gif';
+        $realPath = $targetPath . '/' . $fileName;
+        $thumbnailTargetPath = self::STORAGE_ROOT_DIR . '/.thumbs';
+        $thumbnailDestination = $thumbnailTargetPath . '/' . $fileName;
+        $type = 'image';
+        $result = [
+            'result',
+            'cookie' => [
+                'name' => 'session_name',
+                'value' => '1',
+                'lifetime' => '50',
+                'path' => 'cookie/path',
+                'domain' => 'cookie_domain',
+            ],
+        ];
+        $uploader = $this->getMockBuilder(\Magento\MediaStorage\Model\File\Uploader::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'setAllowedExtensions',
+                    'setAllowRenameFiles',
+                    'setFilesDispersion',
+                    'checkMimeType',
+                    'save',
+                    'getUploadedFileName',
+                ]
+            )
+            ->getMock();
+        $this->uploaderFactoryMock->expects($this->atLeastOnce())->method('create')->with(['fileId' => 'image'])
+            ->willReturn($uploader);
+        $uploader->expects($this->atLeastOnce())->method('setAllowedExtensions')
+            ->with(array_keys($this->allowedImageExtensions))->willReturnSelf();
+        $uploader->expects($this->atLeastOnce())->method('setAllowRenameFiles')->with(true)->willReturnSelf();
+        $uploader->expects($this->atLeastOnce())->method('setFilesDispersion')->with(false)
+            ->willReturnSelf();
+        $uploader->expects($this->atLeastOnce())->method('checkMimeType')
+            ->with(array_values($this->allowedImageExtensions))->willReturnSelf();
+        $uploader->expects($this->atLeastOnce())->method('save')->with($targetPath)->willReturn($result);
+        $uploader->expects($this->atLeastOnce())->method('getUploadedFileName')->willReturn($fileName);
+
+        $this->directoryMock->expects($this->atLeastOnce())->method('getRelativePath')->willReturnMap(
+            [
+                [$realPath, $realPath],
+                [$thumbnailTargetPath, $thumbnailTargetPath],
+                [$thumbnailDestination, $thumbnailDestination],
+            ]
+        );
+        $this->directoryMock->expects($this->atLeastOnce())->method('isFile')
+            ->willReturnMap(
+                [
+                    [$realPath, true],
+                    [$thumbnailDestination, true],
+                ]
+            );
+        $this->directoryMock->expects($this->atLeastOnce())->method('isExist')
+            ->willReturnMap(
+                [
+                    [$realPath, true],
+                    [$thumbnailTargetPath, true],
+                ]
+            );
+
+        $image = $this->getMockBuilder(\Magento\Catalog\Model\Product\Image::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['open', 'keepAspectRatio', 'resize', 'save'])
+            ->getMock();
+        $image->expects($this->atLeastOnce())->method('open')->with($realPath);
+        $image->expects($this->atLeastOnce())->method('keepAspectRatio')->with(true);
+        $image->expects($this->atLeastOnce())->method('resize')->with(100, 50);
+        $image->expects($this->atLeastOnce())->method('save')->with($thumbnailDestination);
+
+        $this->adapterFactoryMock->expects($this->atLeastOnce())->method('create')->willReturn($image);
+
+        $this->sessionMock->expects($this->atLeastOnce())->method('getName')
+            ->willReturn($result['cookie']['name']);
+        $this->sessionMock->expects($this->atLeastOnce())->method('getSessionId')
+            ->willReturn($result['cookie']['value']);
+        $this->sessionMock->expects($this->atLeastOnce())->method('getCookieLifetime')
+            ->willReturn($result['cookie']['lifetime']);
+        $this->sessionMock->expects($this->atLeastOnce())->method('getCookiePath')
+            ->willReturn($result['cookie']['path']);
+        $this->sessionMock->expects($this->atLeastOnce())->method('getCookieDomain')
+            ->willReturn($result['cookie']['domain']);
+
+        $this->assertEquals($result, $this->imagesStorage->uploadFile($targetPath, $type));
+    }
 }
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index 5b0f5e1413461..978d75c9b1e56 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -34,24 +34,24 @@
             </argument>
             <argument name="extensions" xsi:type="array">
                 <item name="allowed" xsi:type="array">
-                    <item name="jpg" xsi:type="number">1</item>
-                    <item name="jpeg" xsi:type="number">1</item>
-                    <item name="png" xsi:type="number">1</item>
-                    <item name="gif" xsi:type="number">1</item>
+                    <item name="jpg" xsi:type="string">image/jpg</item>
+                    <item name="jpeg" xsi:type="string">image/jpeg</item>
+                    <item name="png" xsi:type="string">image/png</item>
+                    <item name="gif" xsi:type="string">image/gif</item>
                 </item>
                 <item name="image_allowed" xsi:type="array">
-                    <item name="jpg" xsi:type="number">1</item>
-                    <item name="jpeg" xsi:type="number">1</item>
-                    <item name="png" xsi:type="number">1</item>
-                    <item name="gif" xsi:type="number">1</item>
+                    <item name="jpg" xsi:type="string">image/jpg</item>
+                    <item name="jpeg" xsi:type="string">image/jpeg</item>
+                    <item name="png" xsi:type="string">image/png</item>
+                    <item name="gif" xsi:type="string">image/gif</item>
                 </item>
                 <item name="media_allowed" xsi:type="array">
-                    <item name="flv" xsi:type="number">1</item>
-                    <item name="swf" xsi:type="number">1</item>
-                    <item name="avi" xsi:type="number">1</item>
-                    <item name="mov" xsi:type="number">1</item>
-                    <item name="rm" xsi:type="number">1</item>
-                    <item name="wmv" xsi:type="number">1</item>
+                    <item name="flv" xsi:type="string">video/x-flv</item>
+                    <item name="swf" xsi:type="string">application/x-shockwave-flash</item>
+                    <item name="avi" xsi:type="string">video/x-msvideo</item>
+                    <item name="mov" xsi:type="string">video/x-sgi-movie</item>
+                    <item name="rm" xsi:type="string">application/vnd.rn-realmedia</item>
+                    <item name="wmv" xsi:type="string">video/x-ms-wmv</item>
                 </item>
             </argument>
             <argument name="dirs" xsi:type="array">
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Queue.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Queue.php
index dc671f9b90d71..c7bbb2eae426f 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Queue.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Queue.php
@@ -18,6 +18,6 @@ class Queue extends \Magento\Mtf\Util\Command\Cli
      */
     public function run($consumer)
     {
-        parent::execute('queue:consumers:start ' . $consumer . ' > /dev/null &');
+        parent::execute('queue:consumers:start ' . $consumer . ' --max-messages=100');
     }
 }
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Setup.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Setup.php
index aabe948cd5d15..e67f4cf1a1aa2 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Setup.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Setup.php
@@ -23,13 +23,6 @@ class Setup extends Cli
      */
     const PARAM_SETUP_DI_COMPILE = 'setup:di:compile';
 
-    /**
-     * Options for uninstall Magento command.
-     *
-     * @var array
-     */
-    private $options = ['-n'];
-
     /**
      * Uninstall Magento.
      *
@@ -37,7 +30,7 @@ class Setup extends Cli
      */
     public function uninstall()
     {
-        parent::execute(Setup::PARAM_SETUP_UNINSTALL, $this->options);
+        parent::execute(Setup::PARAM_SETUP_UNINSTALL);
     }
 
     /**
diff --git a/dev/tests/functional/utils/command.php b/dev/tests/functional/utils/command.php
index cf19790aa8fed..8eaf82475a4e4 100644
--- a/dev/tests/functional/utils/command.php
+++ b/dev/tests/functional/utils/command.php
@@ -4,29 +4,20 @@
  * See COPYING.txt for license details.
  */
 
+require_once __DIR__ . '/../../../../app/bootstrap.php';
+
+use Symfony\Component\Console\Input\StringInput;
+use Symfony\Component\Console\Output\NullOutput;
+
 if (isset($_GET['command'])) {
-    $php = PHP_BINARY ?: (PHP_BINDIR ? PHP_BINDIR . '/php' : 'php');
     $command = urldecode($_GET['command']);
-    exec(escapeCommand($php . ' -f ../../../../bin/magento ' . $command));
+    $magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
+    $magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
+    $cli = $magentoObjectManager->create(\Magento\Framework\Console\Cli::class);
+    $input = new StringInput($command);
+    $input->setInteractive(false);
+    $output = new NullOutput();
+    $cli->doRun($input, $output);
 } else {
     throw new \InvalidArgumentException("Command GET parameter is not set.");
 }
-
-/**
- * Returns escaped command.
- *
- * @param string $command
- * @return string
- */
-function escapeCommand($command)
-{
-    $escapeExceptions = [
-        '> /dev/null &' => '--dev-null-amp--'
-    ];
-
-    $command = escapeshellcmd(
-        str_replace(array_keys($escapeExceptions), array_values($escapeExceptions), $command)
-    );
-
-    return str_replace(array_values($escapeExceptions), array_keys($escapeExceptions), $command);
-}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
new file mode 100644
index 0000000000000..723ff963e2bfc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Tests for the \Magento\Catalog\Model\ImageUploader class
+ */
+class ImageUploaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Catalog\Model\ImageUploader
+     */
+    private $imageUploader;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    private $mediaDirectory;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var \Magento\Framework\Filesystem $filesystem */
+        $this->filesystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        /** @var $uploader \Magento\MediaStorage\Model\File\Uploader */
+        $this->imageUploader = $this->objectManager->create(
+            \Magento\Catalog\Model\ImageUploader::class,
+            [
+                'baseTmpPath' => $this->mediaDirectory->getRelativePath('tmp'),
+                'basePath' => __DIR__,
+                'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png']
+            ]
+        );
+    }
+
+    public function testSaveFileToTmpDir()
+    {
+        $fileName = 'magento_small_image.jpg';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $fixtureDir = realpath(__DIR__ . '/../_files');
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        copy($fixtureDir . DIRECTORY_SEPARATOR . $fileName, $filePath);
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'image/jpeg',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->imageUploader->saveFileToTmpDir('image');
+        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR. $fileName;
+        $this->assertTrue(is_file($this->mediaDirectory->getAbsolutePath($filePath)));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage File validation failed.
+     */
+    public function testSaveFileToTmpDirWithWrongExtension()
+    {
+        $fileName = 'text.txt';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $file = fopen($filePath, "wb");
+        fwrite($file, 'just a text');
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'text/plain',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->imageUploader->saveFileToTmpDir('image');
+        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR. $fileName;
+        $this->assertFalse(is_file($this->mediaDirectory->getAbsolutePath($filePath)));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage File validation failed.
+     */
+    public function testSaveFileToTmpDirWithWrongFile()
+    {
+        $fileName = 'file.gif';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $file = fopen($filePath, "wb");
+        fwrite($file, 'just a text');
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'image/gif',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->imageUploader->saveFileToTmpDir('image');
+        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR. $fileName;
+        $this->assertFalse(is_file($this->mediaDirectory->getAbsolutePath($filePath)));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tearDownAfterClass()
+    {
+        parent::tearDownAfterClass();
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Framework\Filesystem::class
+        );
+        /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $mediaDirectory */
+        $mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $mediaDirectory->delete('tmp');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
index 13a381008b2be..e25934fb25ee1 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
@@ -20,6 +20,24 @@ class StorageTest extends \PHPUnit\Framework\TestCase
      */
     protected static $_baseDir;
 
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var \Magento\Cms\Model\Wysiwyg\Images\Storage
+     */
+    private $storage;
+
+    /**
+     * @inheritdoc
+     */
     public static function setUpBeforeClass()
     {
         self::$_baseDir = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -31,6 +49,9 @@ public static function setUpBeforeClass()
         touch(self::$_baseDir . '/1.swf');
     }
 
+    /**
+     * @inheritdoc
+     */
     public static function tearDownAfterClass()
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -40,19 +61,25 @@ public static function tearDownAfterClass()
         );
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->filesystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
+        $this->storage = $this->objectManager->create(\Magento\Cms\Model\Wysiwyg\Images\Storage::class);
+    }
+
     /**
      * @magentoAppIsolation enabled
+     * @return void
      */
-    public function testGetFilesCollection()
+    public function testGetFilesCollection(): void
     {
         \Magento\TestFramework\Helper\Bootstrap::getInstance()
             ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $objectManager->get(\Magento\Framework\View\DesignInterface::class)
-            ->setDesignTheme('Magento/backend');
-        /** @var $model \Magento\Cms\Model\Wysiwyg\Images\Storage */
-        $model = $objectManager->create(\Magento\Cms\Model\Wysiwyg\Images\Storage::class);
-        $collection = $model->getFilesCollection(self::$_baseDir, 'media');
+        $collection = $this->storage->getFilesCollection(self::$_baseDir, 'media');
         $this->assertInstanceOf(\Magento\Cms\Model\Wysiwyg\Images\Storage\Collection::class, $collection);
         foreach ($collection as $item) {
             $this->assertInstanceOf(\Magento\Framework\DataObject::class, $item);
@@ -67,45 +94,86 @@ public function testGetFilesCollection()
 
     /**
      * @magentoAppArea adminhtml
+     * @return void
      */
-    public function testGetThumbsPath()
+    public function testGetThumbsPath(): void
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var \Magento\Framework\Filesystem $filesystem */
-        $filesystem = $objectManager->get(\Magento\Framework\Filesystem::class);
-        $session = $objectManager->get(\Magento\Backend\Model\Session::class);
-        $backendUrl = $objectManager->get(\Magento\Backend\Model\UrlInterface::class);
-        $imageFactory = $objectManager->get(\Magento\Framework\Image\AdapterFactory::class);
-        $assetRepo = $objectManager->get(\Magento\Framework\View\Asset\Repository::class);
-        $imageHelper = $objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
-        $coreFileStorageDb = $objectManager->get(\Magento\MediaStorage\Helper\File\Storage\Database::class);
-        $storageCollectionFactory = $objectManager->get(
-            \Magento\Cms\Model\Wysiwyg\Images\Storage\CollectionFactory::class
-        );
-        $storageFileFactory = $objectManager->get(\Magento\MediaStorage\Model\File\Storage\FileFactory::class);
-        $storageDatabaseFactory = $objectManager->get(\Magento\MediaStorage\Model\File\Storage\DatabaseFactory::class);
-        $directoryDatabaseFactory = $objectManager->get(
-            \Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory::class
-        );
-        $uploaderFactory = $objectManager->get(\Magento\MediaStorage\Model\File\UploaderFactory::class);
-
-        $model = new \Magento\Cms\Model\Wysiwyg\Images\Storage(
-            $session,
-            $backendUrl,
-            $imageHelper,
-            $coreFileStorageDb,
-            $filesystem,
-            $imageFactory,
-            $assetRepo,
-            $storageCollectionFactory,
-            $storageFileFactory,
-            $storageDatabaseFactory,
-            $directoryDatabaseFactory,
-            $uploaderFactory
-        );
         $this->assertStringStartsWith(
-            $filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath(),
-            $model->getThumbsPath()
+            $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath(),
+            $this->storage->getThumbsPath()
         );
     }
+
+    /**
+     * @return void
+     */
+    public function testUploadFile(): void
+    {
+        $fileName = 'magento_small_image.jpg';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $fixtureDir = realpath(__DIR__ . '/../../../../Catalog/_files');
+        copy($fixtureDir . DIRECTORY_SEPARATOR . $fileName, $filePath);
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'image/jpeg',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->storage->uploadFile(self::$_baseDir);
+        $this->assertTrue(is_file(self::$_baseDir . DIRECTORY_SEPARATOR . $fileName));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage File validation failed.
+     * @return void
+     */
+    public function testUploadFileWithWrongExtension(): void
+    {
+        $fileName = 'text.txt';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $file = fopen($filePath, "wb");
+        fwrite($file, 'just a text');
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'text/plain',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->storage->uploadFile(self::$_baseDir);
+        $this->assertFalse(is_file(self::$_baseDir . DIRECTORY_SEPARATOR . $fileName));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage File validation failed.
+     * @return void
+     */
+    public function testUploadFileWithWrongFile(): void
+    {
+        $fileName = 'file.gif';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $file = fopen($filePath, "wb");
+        fwrite($file, 'just a text');
+
+        $_FILES['image'] = [
+            'name' => $fileName,
+            'type' => 'image/gif',
+            'tmp_name' => $filePath,
+            'error' => 0,
+            'size' => 12500,
+        ];
+
+        $this->storage->uploadFile(self::$_baseDir);
+        $this->assertFalse(is_file(self::$_baseDir . DIRECTORY_SEPARATOR . $fileName));
+    }
 }
diff --git a/lib/internal/Magento/Framework/File/Mime.php b/lib/internal/Magento/Framework/File/Mime.php
index 7fbdab18d17ff..8f89903f5dd13 100644
--- a/lib/internal/Magento/Framework/File/Mime.php
+++ b/lib/internal/Magento/Framework/File/Mime.php
@@ -58,6 +58,23 @@ class Mime
         'ps'   => 'application/postscript',
     ];
 
+    /**
+     * List of mime types that can be defined by file extension
+     *
+     * @var array $defineByExtensionList
+     */
+    private $defineByExtensionList = [
+        'txt'  => 'text/plain',
+        'htm'  => 'text/html',
+        'html' => 'text/html',
+        'php'  => 'text/html',
+        'css'  => 'text/css',
+        'js'   => 'application/javascript',
+        'json' => 'application/json',
+        'xml'  => 'application/xml',
+        'svg' => 'image/svg+xml',
+    ];
+
     /**
      * Get mime type of a file
      *
@@ -71,19 +88,50 @@ public function getMimeType($file)
             throw new \InvalidArgumentException("File '$file' doesn't exist");
         }
 
-        $extension = strtolower(pathinfo($file, PATHINFO_EXTENSION));
-        if (isset($this->mimeTypes[$extension])) {
-            $result = $this->mimeTypes[$extension];
-        }
+        $result = null;
+        $extension = $this->getFileExtension($file);
 
-        if (empty($result) && (function_exists('mime_content_type') && ini_get('mime_magic.magicfile'))) {
-            $result = mime_content_type($file);
+        if (function_exists('mime_content_type')) {
+            $result = $this->getNativeMimeType($file);
         }
 
-        if (empty($result)) {
+        if (null === $result && isset($this->mimeTypes[$extension])) {
+            $result = $this->mimeTypes[$extension];
+        } elseif (null === $result) {
             $result = 'application/octet-stream';
         }
 
         return $result;
     }
+
+    /**
+     * Get mime type by the native mime_content_type function.
+     * Search for extended mime type if mime_content_type() returned 'application/octet-stream' or 'text/plain'
+     *
+     * @param string $file
+     * @return string
+     */
+    private function getNativeMimeType(string $file): string
+    {
+        $extension = $this->getFileExtension($file);
+        $result = mime_content_type($file);
+        if (isset($this->mimeTypes[$extension], $this->defineByExtensionList[$extension])
+            && (strpos($result, 'text/') === 0 || strpos($result, 'image/svg') === 0)
+        ) {
+            $result = $this->mimeTypes[$extension];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get file extension by file name
+     *
+     * @param string $file
+     * @return string
+     */
+    private function getFileExtension(string $file): string
+    {
+        return strtolower(pathinfo($file, PATHINFO_EXTENSION));
+    }
 }
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/_files/UPPERCASE.WEIRD b/lib/internal/Magento/Framework/File/Test/Unit/_files/UPPERCASE.WEIRD
index e69de29bb2d1d..b361f47e9c25d 100644
--- a/lib/internal/Magento/Framework/File/Test/Unit/_files/UPPERCASE.WEIRD
+++ b/lib/internal/Magento/Framework/File/Test/Unit/_files/UPPERCASE.WEIRD
@@ -0,0 +1 @@
+�
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/_files/file.weird b/lib/internal/Magento/Framework/File/Test/Unit/_files/file.weird
index e69de29bb2d1d..b361f47e9c25d 100644
--- a/lib/internal/Magento/Framework/File/Test/Unit/_files/file.weird
+++ b/lib/internal/Magento/Framework/File/Test/Unit/_files/file.weird
@@ -0,0 +1 @@
+�
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index 67d7d4bb558ae..c86f98c4e413a 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -118,6 +118,11 @@ class Uploader
      */
     protected $_validateCallbacks = [];
 
+    /**
+     * @var \Magento\Framework\File\Mime
+     */
+    private $fileMime;
+
     /**#@+
      * File upload type (multiple or single)
      */
@@ -154,10 +159,13 @@ class Uploader
      * Init upload
      *
      * @param string|array $fileId
+     * @param \Magento\Framework\File\Mime|null $fileMime
      * @throws \Exception
      */
-    public function __construct($fileId)
-    {
+    public function __construct(
+        $fileId,
+        Mime $fileMime = null
+    ) {
         $this->_setUploadFileId($fileId);
         if (!file_exists($this->_file['tmp_name'])) {
             $code = empty($this->_file['tmp_name']) ? self::TMP_NAME_EMPTY : 0;
@@ -165,6 +173,7 @@ public function __construct($fileId)
         } else {
             $this->_fileExists = true;
         }
+        $this->fileMime = $fileMime ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Mime::class);
     }
 
     /**
@@ -511,7 +520,7 @@ public function checkAllowedExtension($extension)
      */
     private function _getMimeType()
     {
-        return $this->_file['type'];
+        return $this->fileMime->getMimeType($this->_file['tmp_name']);
     }
 
     /**

From 451151397df5d8b73b51b6688d8422027a360522 Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <fanta1408@gmail.com>
Date: Fri, 22 Jun 2018 11:41:43 +0300
Subject: [PATCH 046/127]     MAGETWO-90301: Extend MFTF tests to check
 Checkout Success page

---
 .../Checkout/Test/CheckCheckoutSuccessPageTest.xml              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
index eba21db6ef0d1..8cfa69c13a35b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
@@ -114,8 +114,10 @@
         <!--Check "Print Receipt" button is presented (desktop only)-->
         <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint"/>
         <resizeWindow width="600" height="800" stepKey="resizeWindow"/>
+        <waitForElementNotVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitInvisiblePrint"/>
         <dontSeeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeInvisiblePrint"/>
         <maximizeWindow stepKey="maximizeWindowKey1"/>
+        <waitForElementVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitVisiblePrint"/>cd
         <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint2" />
 
         <!--See print page-->

From 250532afd2fc6e998c5295764ee9978014791b80 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com>
Date: Fri, 22 Jun 2018 11:55:09 +0300
Subject: [PATCH 047/127] MAGETWO-86718: x-frame-options missing from a few
 templates

---
 .../Model/File/Storage/Response.php           |  6 +-
 .../Unit/Model/File/Storage/ResponseTest.php  | 74 +++++++++++++++++++
 .../Model/File/Storage/ResponseTest.php       | 60 +++++++++++++++
 .../MediaStorage/_files/test_file.html        |  1 +
 .../Test/Unit/Transfer/Adapter/HttpTest.php   | 41 +++++++++-
 .../Framework/File/Transfer/Adapter/Http.php  | 34 +++++++--
 6 files changed, 203 insertions(+), 13 deletions(-)
 create mode 100644 app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/ResponseTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/MediaStorage/Model/File/Storage/ResponseTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/MediaStorage/_files/test_file.html

diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Response.php b/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
index 216068c9fc32a..1125dfd81ad84 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
@@ -56,7 +56,11 @@ public function __construct(
     public function sendResponse()
     {
         if ($this->_filePath && $this->getHttpResponseCode() == 200) {
-            $this->_transferAdapter->send($this->_filePath);
+            $options = [
+                'filepath' => $this->_filePath,
+                'headers' => $this->getHeaders(),
+            ];
+            $this->_transferAdapter->send($options);
         } else {
             parent::sendResponse();
         }
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/ResponseTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/ResponseTest.php
new file mode 100644
index 0000000000000..cdeb47d2b8490
--- /dev/null
+++ b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/ResponseTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Test\Unit\Model\File\Storage;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/** Unit tests for \Magento\MediaStorage\Model\File\Storage\Response class */
+class ResponseTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\MediaStorage\Model\File\Storage\Response
+     */
+    private $response;
+
+    /**
+     * @var \Magento\Framework\File\Transfer\Adapter\Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $transferAdapter;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->transferAdapter = $this->getMockBuilder(\Magento\Framework\File\Transfer\Adapter\Http::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['send'])
+            ->getMock();
+        $this->response = $objectManager->getObject(
+            \Magento\MediaStorage\Model\File\Storage\Response::class,
+            [
+                'transferAdapter' => $this->transferAdapter,
+                'statusCode' => 200,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testSendResponse(): void
+    {
+        $filePath = 'file_path';
+        $headers = $this->getMockBuilder(\Zend\Http\Headers::class)->getMock();
+        $this->response->setFilePath($filePath);
+        $this->response->setHeaders($headers);
+        $this->transferAdapter
+            ->expects($this->atLeastOnce())
+            ->method('send')
+            ->with(
+                [
+                    'filepath' => $filePath,
+                    'headers' => $headers,
+                ]
+            );
+
+        $this->response->sendResponse();
+    }
+
+    /**
+     * @return void
+     */
+    public function testSendResponseWithoutFilePath(): void
+    {
+        $this->transferAdapter->expects($this->never())->method('send');
+        $this->response->sendResponse();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MediaStorage/Model/File/Storage/ResponseTest.php b/dev/tests/integration/testsuite/Magento/MediaStorage/Model/File/Storage/ResponseTest.php
new file mode 100644
index 0000000000000..ffc1005c61150
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MediaStorage/Model/File/Storage/ResponseTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Model\File\Storage;
+
+/**
+ * Tests for \Magento\MediaStorage\Model\File\Storage\Response class
+ */
+class ResponseTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * test for \Magento\MediaStorage\Model\File\Storage\Response::sendResponse()
+     *
+     * @return void
+     */
+    public function testSendResponse(): void
+    {
+        $expectedHeaders = [
+            [
+                'field_name' => 'X-Content-Type-Options',
+                'field_value' => 'nosniff',
+            ],
+            [
+                'field_name' => 'X-XSS-Protection',
+                'field_value' => '1; mode=block',
+            ],
+            [
+                'field_name' => 'X-Frame-Options',
+                'field_value' => 'SAMEORIGIN',
+            ],
+        ];
+        $filePath = realpath(__DIR__ . '/../../../_files/test_file.html');
+        /** @var \Magento\MediaStorage\Model\File\Storage\Response $response */
+        $mediaStorageResponse = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\MediaStorage\Model\File\Storage\Response::class
+        );
+        $mediaStorageResponse->setFilePath($filePath);
+        ob_start();
+        $mediaStorageResponse->sendResponse();
+        ob_end_clean();
+        /** @var \Magento\Framework\App\Response\Http $frameworkResponse */
+        $frameworkResponse = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Framework\HTTP\PhpEnvironment\Response::class
+        );
+        $actualHeaders = [];
+        foreach ($frameworkResponse->getHeaders() as $responseHeader) {
+            $actualHeaders[] = [
+                'field_name' => $responseHeader->getFieldName(),
+                'field_value' => $responseHeader->getFieldValue(),
+            ];
+        }
+        foreach ($expectedHeaders as $expected) {
+            $this->assertTrue(in_array($expected, $actualHeaders));
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MediaStorage/_files/test_file.html b/dev/tests/integration/testsuite/Magento/MediaStorage/_files/test_file.html
new file mode 100644
index 0000000000000..082b3465b6ac4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MediaStorage/_files/test_file.html
@@ -0,0 +1 @@
+test data
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php b/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
index 5429c9e862188..d945791282a2d 100644
--- a/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
+++ b/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
@@ -24,17 +24,23 @@ class HttpTest extends \PHPUnit\Framework\TestCase
      */
     private $mime;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->response = $this->createPartialMock(
             \Magento\Framework\HTTP\PhpEnvironment\Response::class,
-            ['setHeader', 'sendHeaders']
+            ['setHeader', 'sendHeaders', 'setHeaders']
         );
         $this->mime = $this->createMock(\Magento\Framework\File\Mime::class);
         $this->object = new Http($this->response, $this->mime);
     }
 
-    public function testSend()
+    /**
+     * @return void
+     */
+    public function testSend(): void
     {
         $file = __DIR__ . '/../../_files/javascript.js';
         $contentType = 'content/type';
@@ -56,11 +62,37 @@ public function testSend()
         $this->object->send($file);
     }
 
+    /**
+     * @return void
+     */
+    public function testSendWithOptions(): void
+    {
+        $file = __DIR__ . '/../../_files/javascript.js';
+        $contentType = 'content/type';
+
+        $headers = $this->getMockBuilder(\Zend\Http\Headers::class)->getMock();
+        $this->response->expects($this->atLeastOnce())
+            ->method('setHeader')
+            ->withConsecutive(['Content-length', filesize($file)], ['Content-Type', $contentType]);
+        $this->response->expects($this->atLeastOnce())
+            ->method('setHeaders')
+            ->with($headers);
+        $this->response->expects($this->once())
+            ->method('sendHeaders');
+        $this->mime->expects($this->once())
+            ->method('getMimeType')
+            ->with($file)
+            ->will($this->returnValue($contentType));
+        $this->expectOutputString(file_get_contents($file));
+
+        $this->object->send(['filepath' => $file, 'headers' => $headers]);
+    }
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Filename is not set
+     * @return void
      */
-    public function testSendNoFileSpecifiedException()
+    public function testSendNoFileSpecifiedException(): void
     {
         $this->object->send([]);
     }
@@ -68,8 +100,9 @@ public function testSendNoFileSpecifiedException()
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage File 'nonexistent.file' does not exists
+     * @return void
      */
-    public function testSendNoFileExistException()
+    public function testSendNoFileExistException(): void
     {
         $this->object->send('nonexistent.file');
     }
diff --git a/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php b/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
index 1cd270329ed2c..aa527866eff55 100644
--- a/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
+++ b/lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php
@@ -40,20 +40,16 @@ public function __construct(
      */
     public function send($options = null)
     {
-        if (is_string($options)) {
-            $filepath = $options;
-        } elseif (is_array($options) && isset($options['filepath'])) {
-            $filepath = $options['filepath'];
-        } else {
-            throw new \InvalidArgumentException("Filename is not set.");
-        }
+        $filepath = $this->getFilePath($options);
 
         if (!is_file($filepath) || !is_readable($filepath)) {
             throw new \InvalidArgumentException("File '{$filepath}' does not exists.");
         }
 
         $mimeType = $this->mime->getMimeType($filepath);
-
+        if (is_array($options) && isset($options['headers']) && $options['headers'] instanceof \Zend\Http\Headers) {
+            $this->response->setHeaders($options['headers']);
+        }
         $this->response->setHeader('Content-length', filesize($filepath));
         $this->response->setHeader('Content-Type', $mimeType);
 
@@ -70,4 +66,26 @@ public function send($options = null)
             fclose($handle);
         }
     }
+
+    /**
+     * Get filepath by provided parameter $optons.
+     * If the $options is a string it assumes it's a file path. If the option is an array method will look for the
+     * 'filepath' key and return it's value.
+     *
+     * @param string|array|null $options
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    private function getFilePath($options): string
+    {
+        if (is_string($options)) {
+            $filePath = $options;
+        } elseif (is_array($options) && isset($options['filepath'])) {
+            $filePath = $options['filepath'];
+        } else {
+            throw new \InvalidArgumentException("Filename is not set.");
+        }
+
+        return $filePath;
+    }
 }

From c3c7b7cef85b5013bdfbdfc34559fb296431e8e5 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 22 Jun 2018 13:53:25 +0300
Subject: [PATCH 048/127] MAGETWO-92884: Shipping page contains the equal
 shipping addresses after adding a user.

---
 app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php b/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php
index 21ea9a394465d..2e9f0c50bb29e 100644
--- a/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php
+++ b/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php
@@ -11,7 +11,6 @@
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Framework\DataObject\Copy as CopyService;
-use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\RegionInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory as AddressFactory;
 use Magento\Customer\Api\Data\RegionInterfaceFactory as RegionFactory;

From f12bb9c5436e08a6cc08d9c523f7e8f317e408e9 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 22 Jun 2018 14:53:45 +0300
Subject: [PATCH 049/127] MAGETWO-92884: Shipping page contains the equal
 shipping addresses after adding a user.

---
 app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php b/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php
index 2e9f0c50bb29e..2f4d02109770b 100644
--- a/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php
+++ b/app/code/Magento/Sales/Model/Order/OrderCustomerExtractor.php
@@ -119,7 +119,7 @@ public function extract(int $orderId): CustomerInterface
                 // create new customer address only if it is unique
                 $customerAddress = $this->addressFactory->create(['data' => $addressData]);
                 $customerAddress->setIsDefaultBilling(false);
-                $customerAddress->setIsDefaultBilling(false);
+                $customerAddress->setIsDefaultShipping(false);
                 if (is_string($orderAddress->getRegion())) {
                     /** @var RegionInterface $region */
                     $region = $this->regionFactory->create();

From ac7436d0110dc85db4b9c14298ce3a3e3816a607 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 25 Jun 2018 16:46:18 +0300
Subject: [PATCH 050/127] MAGETWO-85134: IP resolving issue

---
 .../HTTP/PhpEnvironment/RemoteAddress.php     | 120 ++++++++++++----
 .../Unit/PhpEnvironment/RemoteAddressTest.php | 132 +++++++++++++++---
 2 files changed, 209 insertions(+), 43 deletions(-)

diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
index 3b2f79eecb370..dfe4b759e85be 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
@@ -5,20 +5,22 @@
  */
 namespace Magento\Framework\HTTP\PhpEnvironment;
 
+use Magento\Framework\App\RequestInterface;
+
 /**
- * Library for working with client ip address
+ * Library for working with client ip address.
  */
 class RemoteAddress
 {
     /**
-     * Request object
+     * Request object.
      *
-     * @var \Magento\Framework\App\RequestInterface
+     * @var RequestInterface
      */
     protected $request;
 
     /**
-     * Remote address cache
+     * Remote address cache.
      *
      * @var string
      */
@@ -30,46 +32,114 @@ class RemoteAddress
     protected $alternativeHeaders;
 
     /**
-     * @param \Magento\Framework\App\RequestInterface $httpRequest
+     * @var string[]|null
+     */
+    private $trustedProxies;
+
+    /**
+     * @param RequestInterface $httpRequest
      * @param array $alternativeHeaders
+     * @param string[]|null $trustedProxies
      */
-    public function __construct(\Magento\Framework\App\RequestInterface $httpRequest, array $alternativeHeaders = [])
-    {
+    public function __construct(
+        RequestInterface $httpRequest,
+        array $alternativeHeaders = [],
+        array $trustedProxies = null
+    ) {
         $this->request = $httpRequest;
         $this->alternativeHeaders = $alternativeHeaders;
+        $this->trustedProxies = $trustedProxies;
     }
 
     /**
-     * Retrieve Client Remote Address
+     * Read address based on settings.
      *
-     * @param bool $ipToLong converting IP to long format
-     * @return string IPv4|long
+     * @return string|null
      */
-    public function getRemoteAddress($ipToLong = false)
+    private function readAddress()
     {
-        if ($this->remoteAddress === null) {
-            foreach ($this->alternativeHeaders as $var) {
-                if ($this->request->getServer($var, false)) {
-                    $this->remoteAddress = $this->request->getServer($var);
-                    break;
-                }
+        $remoteAddress = null;
+        foreach ($this->alternativeHeaders as $var) {
+            if ($this->request->getServer($var, false)) {
+                $remoteAddress = $this->request->getServer($var);
+                break;
             }
+        }
 
-            if (!$this->remoteAddress) {
-                $this->remoteAddress = $this->request->getServer('REMOTE_ADDR');
+        if (!$remoteAddress) {
+            $remoteAddress = $this->request->getServer('REMOTE_ADDR');
+        }
+
+        return $remoteAddress;
+    }
+
+    /**
+     * Filter addresses by trusted proxies list.
+     *
+     * @param string $remoteAddress
+     * @return string|null
+     */
+    private function filterAddress(string $remoteAddress)
+    {
+        if (strpos($remoteAddress, ',') !== false) {
+            $ipList = explode(',', $remoteAddress);
+        } else {
+            $ipList = [$remoteAddress];
+        }
+        $ipList = array_filter(
+            $ipList,
+            function (string $ip) {
+                return filter_var(trim($ip), FILTER_VALIDATE_IP);
             }
+        );
+        if ($this->trustedProxies !== null) {
+            $ipList = array_filter(
+                $ipList,
+                function (string $ip) {
+                    return !in_array(trim($ip), $this->trustedProxies, true);
+                }
+            );
+            $remoteAddress = trim(array_pop($ipList));
+        } else {
+            $remoteAddress = trim(reset($ipList));
         }
 
-        if (!$this->remoteAddress) {
-            return false;
+        return $remoteAddress ?: null;
+    }
+
+    /**
+     * Retrieve Client Remote Address.
+     * If alternative headers are used and said headers allow multiple IPs
+     * it is suggested that trusted proxies is also used
+     * for more accurate IP recognition.
+     *
+     * @param bool $ipToLong converting IP to long format
+     *
+     * @return string IPv4|long
+     */
+    public function getRemoteAddress(bool $ipToLong = false)
+    {
+        if ($this->remoteAddress !== null) {
+            return $this->remoteAddress;
         }
 
-        if (strpos($this->remoteAddress, ',') !== false) {
-            $ipList = explode(',', $this->remoteAddress);
-            $this->remoteAddress = trim(reset($ipList));
+        $remoteAddress = $this->readAddress();
+        if (!$remoteAddress) {
+            $this->remoteAddress = false;
+
+            return false;
         }
+        $remoteAddress = $this->filterAddress($remoteAddress);
 
-        return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
+        if (!$remoteAddress) {
+            $this->remoteAddress = false;
+
+            return false;
+        } else {
+            $this->remoteAddress = $remoteAddress;
+
+            return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
+        }
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
index 30b50d9360d81..538359edd4306 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
@@ -5,44 +5,70 @@
  */
 namespace Magento\Framework\HTTP\Test\Unit\PhpEnvironment;
 
+use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 class RemoteAddressTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Request\Http
+     * @var \PHPUnit_Framework_MockObject_MockObject|\HttpRequest
      */
     protected $_request;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
     protected $_objectManager;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->_request = $this->getMockBuilder(
-            \Magento\Framework\App\Request\Http::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getServer']
-        )->getMock();
+        $this->_request = $this->getMockBuilder(HttpRequest::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getServer'])
+            ->getMock();
 
-        $this->_objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->_objectManager = new ObjectManager($this);
     }
 
     /**
+     * @param string[] $alternativeHeaders
+     * @param array $serverValueMap
+     * @param string|bool $expected
+     * @param bool $ipToLong
+     * @param string[]|null $trustedProxies
+     * @return void
      * @dataProvider getRemoteAddressProvider
      */
-    public function testGetRemoteAddress($alternativeHeaders, $serverValueMap, $expected, $ipToLong)
-    {
+    public function testGetRemoteAddress(
+        array $alternativeHeaders,
+        array $serverValueMap,
+        $expected,
+        bool $ipToLong,
+        array $trustedProxies = null
+    ): void {
         $remoteAddress = $this->_objectManager->getObject(
-            \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::class,
-            ['httpRequest' => $this->_request, 'alternativeHeaders' => $alternativeHeaders]
+            RemoteAddress::class,
+            [
+                'httpRequest' => $this->_request,
+                'alternativeHeaders' => $alternativeHeaders,
+                'trustedProxies' => $trustedProxies,
+            ]
         );
-        $this->_request->expects($this->any())->method('getServer')->will($this->returnValueMap($serverValueMap));
+        $this->_request->expects($this->any())
+            ->method('getServer')
+            ->will($this->returnValueMap($serverValueMap));
+
         $this->assertEquals($expected, $remoteAddress->getRemoteAddress($ipToLong));
     }
 
     /**
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getRemoteAddressProvider()
     {
@@ -52,18 +78,21 @@ public function getRemoteAddressProvider()
                 'serverValueMap' => [['REMOTE_ADDR', null, null]],
                 'expected' => false,
                 'ipToLong' => false,
+                'trustedProxies' => null,
             ],
             [
                 'alternativeHeaders' => [],
                 'serverValueMap' => [['REMOTE_ADDR', null, '192.168.0.1']],
                 'expected' => '192.168.0.1',
-                'ipToLong' => false
+                'ipToLong' => false,
+                'trustedProxies' => null,
             ],
             [
                 'alternativeHeaders' => [],
                 'serverValueMap' => [['REMOTE_ADDR', null, '192.168.1.1']],
                 'expected' => ip2long('192.168.1.1'),
-                'ipToLong' => true
+                'ipToLong' => true,
+                'trustedProxies' => null,
             ],
             [
                 'alternativeHeaders' => ['TEST_HEADER'],
@@ -73,7 +102,8 @@ public function getRemoteAddressProvider()
                     ['TEST_HEADER', false, '192.168.0.1'],
                 ],
                 'expected' => '192.168.0.1',
-                'ipToLong' => false
+                'ipToLong' => false,
+                'trustedProxies' => null,
             ],
             [
                 'alternativeHeaders' => ['TEST_HEADER'],
@@ -83,8 +113,74 @@ public function getRemoteAddressProvider()
                     ['TEST_HEADER', false, '192.168.0.1'],
                 ],
                 'expected' => ip2long('192.168.0.1'),
-                'ipToLong' => true
-            ]
+                'ipToLong' => true,
+                'trustedProxies' => null,
+            ],
+            [
+                'alternativeHeaders' => [],
+                'serverValueMap' => [
+                    ['REMOTE_ADDR', null, 'NotValidIp'],
+                ],
+                'expected' => false,
+                'ipToLong' => false,
+                'trustedProxies' => ['127.0.0.1'],
+            ],
+            [
+                'alternativeHeaders' => ['TEST_HEADER'],
+                'serverValueMap' => [
+                    ['TEST_HEADER', null, 'NotValid, 192.168.0.1'],
+                    ['TEST_HEADER', false, 'NotValid, 192.168.0.1'],
+                ],
+                'expected' => '192.168.0.1',
+                'ipToLong' => false,
+                'trustedProxies' => ['127.0.0.1'],
+            ],
+            [
+                'alternativeHeaders' => ['TEST_HEADER'],
+                'serverValueMap' => [
+                    ['TEST_HEADER', null, '192.168.0.2, 192.168.0.1'],
+                    ['TEST_HEADER', false, '192.168.0.2, 192.168.0.1'],
+                ],
+                'expected' => '192.168.0.2',
+                'ipToLong' => false,
+                'trustedProxies' => null,
+            ],
+            [
+                'alternativeHeaders' => [],
+                'serverValueMap' => [
+                    [
+                        'REMOTE_ADDR',
+                        null,
+                        '192.168.0.2, 192.168.0.1, 192.168.0.3',
+                    ],
+                    [
+                        'REMOTE_ADDR',
+                        false,
+                        '192.168.0.2, 192.168.0.1, 192.168.0.3',
+                    ],
+                ],
+                'expected' => '192.168.0.1',
+                'ipToLong' => false,
+                'trustedProxies' => ['192.168.0.3'],
+            ],
+            [
+                'alternativeHeaders' => [],
+                'serverValueMap' => [
+                    [
+                        'REMOTE_ADDR',
+                        null,
+                        '192.168.0.2, 192.168.0.1, 192.168.0.3',
+                    ],
+                    [
+                        'REMOTE_ADDR',
+                        false,
+                        '192.168.0.2, 192.168.0.1, 192.168.0.3',
+                    ],
+                ],
+                'expected' => '192.168.0.3',
+                'ipToLong' => false,
+                'trustedProxies' => [],
+            ],
         ];
     }
 }

From a0946c1eda9bdab3f4c1c9f3feef20721b044800 Mon Sep 17 00:00:00 2001
From: "al.kravchuk" <al.kravchuk@ism-ukraine.com>
Date: Mon, 25 Jun 2018 17:28:57 +0300
Subject: [PATCH 051/127] magento/magento2#?: Login with wishlist raise report
 after logout. - fix error message after login with wishlist; - fix
 possibility to logout after login with wishlist;

---
 app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php b/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php
index b7b462b3cc317..641a91d2e6554 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php
@@ -45,7 +45,7 @@ public function aroundExecute(FlushFormKey $subject, callable $proceed, ...$args
         $currentFormKey = $this->dataFormKey->getFormKey();
         $proceed(...$args);
         $beforeParams = $this->session->getBeforeRequestParams();
-        if ($beforeParams['form_key'] == $currentFormKey) {
+        if (isset($beforeParams['form_key']) && $beforeParams['form_key'] == $currentFormKey) {
             $beforeParams['form_key'] = $this->dataFormKey->getFormKey();
             $this->session->setBeforeRequestParams($beforeParams);
         }

From 3a64d3cac7bd7a8a58badd0883c300d8234a8e53 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Mon, 25 Jun 2018 21:01:30 +0300
Subject: [PATCH 052/127] Fixes updating wishlist item if an item object is
 passed instead its id.

---
 app/code/Magento/Wishlist/Model/Wishlist.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 9eb4e1f5ebcd2..d6284f32c4f5e 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Wishlist\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -637,6 +639,7 @@ public function updateItem($itemId, $buyRequest, $params = null)
         $item = null;
         if ($itemId instanceof Item) {
             $item = $itemId;
+            $itemId = $item->getId();
         } else {
             $item = $this->getItem((int)$itemId);
         }

From 0bba7df1cbcc3ef9b5639b6a37ff03d49e1d2dd0 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@magento.com>
Date: Mon, 25 Jun 2018 14:37:00 -0500
Subject: [PATCH 053/127] MAGETWO-91555: Admin orders can result in a customer
 with an example email address

- added functional test to cover the bug fix
---
 .../ActionGroup/AdminOrderActionGroup.xml     |  3 +
 .../Section/AdminOrderFormAccountSection.xml  |  1 +
 .../AdminOrderFormBillingAddressSection.xml   |  1 +
 ...minSubmitsOrderWithAndWithoutEmailTest.xml | 71 +++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml
index 7461d9010a024..a31cba5518a75 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml
@@ -25,6 +25,8 @@
     <!--Check the required fields are actually required-->
     <actionGroup name="checkRequiredFieldsNewOrderForm">
         <seeElement selector="{{AdminOrderFormAccountSection.requiredGroup}}" stepKey="seeCustomerGroupRequired"/>
+        <seeElement selector="{{AdminOrderFormAccountSection.requiredEmail}}" stepKey="seeEmailRequired"/>
+        <clearField selector="{{AdminOrderFormAccountSection.email}}" stepKey="clearEmailField"/>
         <clearField selector="{{AdminOrderFormBillingAddressSection.FirstName}}" stepKey="clearFirstNameField"/>
         <clearField selector="{{AdminOrderFormBillingAddressSection.LastName}}" stepKey="clearLastNameField"/>
         <clearField selector="{{AdminOrderFormBillingAddressSection.StreetLine1}}" stepKey="clearStreetField"/>
@@ -35,6 +37,7 @@
         <clearField selector="{{AdminOrderFormBillingAddressSection.Phone}}" stepKey="clearPhoneField"/>
         <seeElement selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="seeShippingMethodNotSelected"/>
         <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="trySubmitOrder"/>
+        <see selector="{{AdminOrderFormBillingAddressSection.emailError}}" userInput="This is a required field." stepKey="seeThatEmailIsRequired"/>
         <see selector="{{AdminOrderFormBillingAddressSection.firstNameError}}" userInput="This is a required field." stepKey="seeFirstNameRequired"/>
         <see selector="{{AdminOrderFormBillingAddressSection.lastNameError}}" userInput="This is a required field." stepKey="seeLastNameRequired"/>
         <see selector="{{AdminOrderFormBillingAddressSection.streetAddressError}}" userInput="This is a required field." stepKey="seeStreetRequired"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml
index df3efc481a48f..0b03f089227b9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml
@@ -12,5 +12,6 @@
         <element name="group" type="select" selector="#group_id"/>
         <element name="email" type="input" selector="#email"/>
         <element name="requiredGroup" type="text" selector=".admin__field.required[data-ui-id='billing-address-fieldset-element-form-field-group-id']"/>
+        <element name="requiredEmail" type="text" selector=".admin__field.required[data-ui-id='billing-address-fieldset-element-form-field-email']"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml
index f1000476d50fe..d3348cf2a8e9e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml
@@ -28,6 +28,7 @@
         <element name="ValidateVatNumber" type="button" selector="#order-billing_address_vat_id + .actions>button.action-default" timeout="30"/>
         <element name="SaveAddress" type="checkbox" selector="#order-billing_address_save_in_address_book"/>
 
+        <element name="emailError" type="text" selector="#email-error"/>
         <element name="firstNameError" type="text" selector="#order-billing_address_firstname-error"/>
         <element name="lastNameError" type="text" selector="#order-billing_address_lastname-error"/>
         <element name="streetAddressError" type="text" selector="#order-billing_address_street0-error"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
new file mode 100644
index 0000000000000..0f1c1d70652b0
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminSubmitsOrderWithAndWithoutEmailTest">
+        <annotations>
+            <title value="Email is required to create an order from Admin Panel"/>
+            <description value="Admin should not be able to submit orders without an email address"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-92980"/>
+            <group value="sales"/>
+
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+        </after>
+        <!--Create order via Admin-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
+        <!--<actionGroup ref="navigateToNewOrderPageNewCustomer" stepKey="navigateToNewOrderPage"/>-->
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
+        <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
+        <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
+
+        <!--Check if order can be submitted without the required fields including email address-->
+        <actionGroup ref="checkRequiredFieldsNewOrderForm" stepKey="checkRequiredFieldsNewOrder" after="seeNewOrderPageTitle"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfOrderFormPage" after="checkRequiredFieldsNewOrder"/>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder" after="scrollToTopOfOrderFormPage">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+
+        <!--Fill customer group and customer email-->
+        <selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="{{GeneralCustomerGroup.code}}" stepKey="selectCustomerGroup" after="addSimpleProductToOrder"/>
+        <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
+
+        <!--Fill customer address information-->
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillCustomerEmail">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+        <!-- Select shipping -->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="fillCustomerAddress"/>
+
+        <!--Verify totals on Order page-->
+        <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal" after="selectFlatRateShipping"/>
+        <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeOrderShipping" after="seeOrderSubTotal"/>
+        <scrollTo selector="{{AdminOrderFormTotalSection.grandTotal}}" stepKey="scrollToOrderGrandTotal"/>
+        <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal" after="scrollToOrderGrandTotal"/>
+
+        <!--Submit Order and verify information-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="seeCorrectGrandTotal"/>
+        <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
+        </test>
+    </tests>
\ No newline at end of file

From 22fbe7a5dcd150b55e1aff8ab3c249c3b09f130b Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Mon, 25 Jun 2018 23:05:28 -0500
Subject: [PATCH 054/127] MAGETWO-91555: Admin orders can result in a customer
 with an example email address

- Removed no longer applicable cases
---
 .../Magento/Sales/Model/AdminOrder/CreateTest.php      | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index c54c80bb6f6c7..b1a8d8e685226 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -519,20 +519,14 @@ public function testCreateOrderNewCustomerWithFailedFirstPlaceOrderAction(
      * Email before and after failed first place order action.
      *
      * @case #1 Is the same.
-     * @case #2 Is empty.
-     * @case #3 Filled after failed first place order action.
-     * @case #4 Empty after failed first place order action.
-     * @case #5 Changed after failed first place order action.
+     * @case #2 Changed after failed first place order action.
      * @return array
      */
     public function createOrderNewCustomerWithFailedFirstPlaceOrderActionDataProvider()
     {
         return [
             1 => ['customer@email.com', 'customer@email.com'],
-            2 => ['', ''],
-            3 => ['', 'customer@email.com'],
-            4 => ['customer@email.com', ''],
-            5 => ['customer@email.com', 'changed_customer@email.com'],
+            2 => ['customer@email.com', 'changed_customer@email.com'],
         ];
     }
 

From d8e87dcc8aa73f4804bcd81beb66d06cbd64d1e7 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Tue, 26 Jun 2018 09:18:47 +0300
Subject: [PATCH 055/127] Strict comparison for form_key

---
 app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php b/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php
index 641a91d2e6554..2d000ccfb4b93 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerFlushFormKey.php
@@ -45,7 +45,7 @@ public function aroundExecute(FlushFormKey $subject, callable $proceed, ...$args
         $currentFormKey = $this->dataFormKey->getFormKey();
         $proceed(...$args);
         $beforeParams = $this->session->getBeforeRequestParams();
-        if (isset($beforeParams['form_key']) && $beforeParams['form_key'] == $currentFormKey) {
+        if (isset($beforeParams['form_key']) && $beforeParams['form_key'] === $currentFormKey) {
             $beforeParams['form_key'] = $this->dataFormKey->getFormKey();
             $this->session->setBeforeRequestParams($beforeParams);
         }

From ebaa5ea52440f308d4bd1e41322dff43b13444d4 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Tue, 26 Jun 2018 13:07:43 +0300
Subject: [PATCH 056/127] MAGETWO-89609: [Backport for 2.2.x] Improve import
 files validation

---
 .../Model/Import/Uploader.php                 |  1 +
 .../Model/Import/UploaderTest.php             | 80 +++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
index ac94493722fb1..0939acabbd5fd 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
@@ -241,6 +241,7 @@ protected function _validateFile()
 
         $fileExtension = pathinfo($filePath, PATHINFO_EXTENSION);
         if (!$this->checkAllowedExtension($fileExtension)) {
+            $this->_directory->delete($filePath);
             throw new \Exception('Disallowed file type.');
         }
         //run validate callbacks
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
new file mode 100644
index 0000000000000..980f6bc53e91e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Model\Import;
+
+use Magento\Framework\App\Bootstrap;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Tests for the \Magento\CatalogImportExport\Model\Import\Uploader class.
+ */
+class UploaderTest extends \Magento\TestFramework\Indexer\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     */
+    private $directory;
+
+    /**
+     * @var \Magento\CatalogImportExport\Model\Import\Uploader
+     */
+    private $uploader;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->uploader = $this->objectManager->create(\Magento\CatalogImportExport\Model\Import\Uploader::class);
+
+        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
+
+        $appParams = \Magento\TestFramework\Helper\Bootstrap::getInstance()
+            ->getBootstrap()
+            ->getApplication()
+            ->getInitParams()[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS];
+        $mediaPath = $appParams[DirectoryList::MEDIA][DirectoryList::PATH];
+        $this->directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $tmpDir = $this->directory->getRelativePath($mediaPath . '/import');
+        $this->uploader->setTmpDir($tmpDir);
+
+        parent::setUp();
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     */
+    public function testMoveWithValidFile() : void
+    {
+        $fileName = 'magento_additional_image_one.jpg';
+        $filePath = $this->directory->getAbsolutePath($this->uploader->getTmpDir() . '/' . $fileName);
+        copy(__DIR__ . '/_files/' . $fileName, $filePath);
+        $this->uploader->move($fileName);
+        $this->assertTrue($this->directory->isExist($this->uploader->getTmpDir() . '/' . $fileName));
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @expectedException \Exception
+     */
+    public function testMoveWithInvalidFile() :void
+    {
+        $fileName = 'media_import_image.php';
+        $filePath = $this->directory->getAbsolutePath($this->uploader->getTmpDir() . '/' . $fileName);
+        copy(__DIR__ . '/_files/' . $fileName, $filePath);
+        $this->uploader->move($fileName);
+        $this->assertFalse($this->directory->isExist($this->uploader->getTmpDir() . '/' . $fileName));
+    }
+}

From e1e59702f232719264c1ede721fee7336b4cf80e Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <fanta1408@gmail.com>
Date: Tue, 26 Jun 2018 13:21:55 +0300
Subject: [PATCH 057/127]     MAGETWO-90301: Extend MFTF tests to check
 Checkout Success page

---
 .../Checkout/Test/CheckCheckoutSuccessPageTest.xml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
index 8cfa69c13a35b..89fafcd8bd9d8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
@@ -117,7 +117,7 @@
         <waitForElementNotVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitInvisiblePrint"/>
         <dontSeeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeInvisiblePrint"/>
         <maximizeWindow stepKey="maximizeWindowKey1"/>
-        <waitForElementVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitVisiblePrint"/>cd
+        <waitForElementVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitVisiblePrint"/>
         <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint2" />
 
         <!--See print page-->

From 5487dfaf2b6ddc80b7b3e1e3b2e8c44b291775e4 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Tue, 26 Jun 2018 14:38:58 +0300
Subject: [PATCH 058/127] MAGETWO-92985: Duplicate required fields symbols in
 Category -> Display Settings Section

---
 .../Catalog/view/adminhtml/ui_component/category_form.xml       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
index ee4638670f60e..2976f1be14fa5 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
@@ -251,7 +251,6 @@
                 <item name="type" xsi:type="string">group</item>
                 <item name="config" xsi:type="array">
                     <item name="breakLine" xsi:type="boolean">true</item>
-                    <item name="required" xsi:type="boolean">true</item>
                 </item>
             </argument>
             <field name="available_sort_by" formElement="multiselect">
@@ -292,7 +291,6 @@
                 <item name="type" xsi:type="string">group</item>
                 <item name="config" xsi:type="array">
                     <item name="breakLine" xsi:type="boolean">true</item>
-                    <item name="required" xsi:type="boolean">true</item>
                 </item>
             </argument>
             <field name="default_sort_by" formElement="select">

From e04b7ca8077fcbd269ad2e2f3515af12f7beaba9 Mon Sep 17 00:00:00 2001
From: Tiago Sampaio <tiago@tiagosampaio.com>
Date: Fri, 15 Jun 2018 17:51:00 -0300
Subject: [PATCH 059/127] Changes:

- Created a method to reorder the tabs which is less complex and works better.
---
 .../Magento/Backend/Block/Widget/Tabs.php     | 89 ++++++++++++++-----
 1 file changed, 68 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index 7f146e19e8c6e..dac2217329476 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -117,6 +117,7 @@ public function addTab($tabId, $tab)
         if (empty($tabId)) {
             throw new \Exception(__('Please correct the tab configuration and try again. Tab Id should be not empty'));
         }
+        
         if (is_array($tab)) {
             $this->_tabs[$tabId] = new \Magento\Framework\DataObject($tab);
         } elseif ($tab instanceof \Magento\Framework\DataObject) {
@@ -126,6 +127,7 @@ public function addTab($tabId, $tab)
             }
         } elseif (is_string($tab)) {
             $this->_addTabByName($tab, $tabId);
+            
             if (!$this->_tabs[$tabId] instanceof TabInterface) {
                 unset($this->_tabs[$tabId]);
                 return $this;
@@ -133,6 +135,7 @@ public function addTab($tabId, $tab)
         } else {
             throw new \Exception(__('Please correct the tab configuration and try again.'));
         }
+        
         if ($this->_tabs[$tabId]->getUrl() === null) {
             $this->_tabs[$tabId]->setUrl('#');
         }
@@ -143,10 +146,7 @@ public function addTab($tabId, $tab)
 
         $this->_tabs[$tabId]->setId($tabId);
         $this->_tabs[$tabId]->setTabId($tabId);
-
-        if ($this->_activeTab === null) {
-            $this->_activeTab = $tabId;
-        }
+        
         if (true === $this->_tabs[$tabId]->getActive()) {
             $this->setActiveTab($tabId);
         }
@@ -235,32 +235,79 @@ protected function _setActiveTab($tabId)
      */
     protected function _beforeToHtml()
     {
+        $this->_tabs = $this->reorderTabs();
+        
+        if ($this->_activeTab === null) {
+            foreach ($this->_tabs as $tab) {
+                $this->_activeTab = $tab->getId();
+                break;
+            }
+        }
+        
         if ($activeTab = $this->getRequest()->getParam('active_tab')) {
             $this->setActiveTab($activeTab);
         } elseif ($activeTabId = $this->_authSession->getActiveTabId()) {
             $this->_setActiveTab($activeTabId);
         }
-
-        $_new = [];
+        
+        $this->assign('tabs', $this->_tabs);
+        return parent::_beforeToHtml();
+    }
+    
+    
+    /**
+     * @return array
+     */
+    protected function reorderTabs()
+    {
+        $orderByIdentity = [];
+        $orderByPosition = [];
+        
+        $position  = 100;
+    
+        /**
+         * @var string                                         $key
+         * @var \Magento\Backend\Block\Widget\Tab\TabInterface $tab
+         */
         foreach ($this->_tabs as $key => $tab) {
-            foreach ($this->_tabs as $k => $t) {
-                if ($t->getAfter() == $key) {
-                    $_new[$key] = $tab;
-                    $_new[$k] = $t;
-                } else {
-                    if (!$tab->getAfter() || !in_array($tab->getAfter(), array_keys($this->_tabs))) {
-                        $_new[$key] = $tab;
-                    }
-                }
+            $tab->setPosition($position);
+    
+            $orderByIdentity[$key]      = $tab;
+            $orderByPosition[$position] = $tab;
+            
+            $position += 100;
+        }
+        
+        $positionFactor = 1;
+        
+        foreach ($orderByPosition as $position => $tab) {
+            if (!$tab->getAfter() || !in_array($tab->getAfter(), array_keys($orderByIdentity))) {
+                $positionFactor = 1;
+                continue;
             }
+            
+            $grandPosition = $orderByIdentity[$tab->getAfter()]->getPosition();
+            $newPosition   = $grandPosition + $positionFactor;
+            
+            unset($orderByPosition[$position]);
+            $orderByPosition[$newPosition] = $tab;
+            $tab->setPosition($newPosition);
+    
+            $positionFactor++;
         }
-
-        $this->_tabs = $_new;
-        unset($_new);
-
-        $this->assign('tabs', $this->_tabs);
-        return parent::_beforeToHtml();
+        
+        ksort($orderByPosition);
+    
+        $ordered = [];
+        
+        /** @var  $tab */
+        foreach ($orderByPosition as $tab) {
+            $ordered[$tab->getId()] = $tab;
+        }
+        
+        return $ordered;
     }
+    
 
     /**
      * @return string

From 447667fccfdcbba86dbbd0e5d58d33bc9d8fc1e7 Mon Sep 17 00:00:00 2001
From: Tiago Sampaio <tiago@tiagosampaio.com>
Date: Fri, 15 Jun 2018 18:05:29 -0300
Subject: [PATCH 060/127] Added comments and some descriptions.

---
 app/code/Magento/Backend/Block/Widget/Tabs.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index dac2217329476..91bdc0bf967d2 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -238,6 +238,7 @@ protected function _beforeToHtml()
         $this->_tabs = $this->reorderTabs();
         
         if ($this->_activeTab === null) {
+            /** @var  $tab */
             foreach ($this->_tabs as $tab) {
                 $this->_activeTab = $tab->getId();
                 break;
@@ -266,8 +267,10 @@ protected function reorderTabs()
         $position  = 100;
     
         /**
-         * @var string                                         $key
-         * @var \Magento\Backend\Block\Widget\Tab\TabInterface $tab
+         * Set the initial positions for each tab.
+         *
+         * @var string       $key
+         * @var TabInterface $tab
          */
         foreach ($this->_tabs as $key => $tab) {
             $tab->setPosition($position);
@@ -280,6 +283,12 @@ protected function reorderTabs()
         
         $positionFactor = 1;
         
+        /**
+         * Rearrange the positions by using the after tag for each tab.
+         *
+         * @var integer      $position
+         * @var TabInterface $tab
+         */
         foreach ($orderByPosition as $position => $tab) {
             if (!$tab->getAfter() || !in_array($tab->getAfter(), array_keys($orderByIdentity))) {
                 $positionFactor = 1;

From 0dd4268c9c2a4398d54cf9c71cd5272ffe2f9e73 Mon Sep 17 00:00:00 2001
From: Tiago Sampaio <tiago@tiagosampaio.com>
Date: Wed, 20 Jun 2018 12:35:07 -0300
Subject: [PATCH 061/127] Tiny changes to add the type of a variable.

---
 app/code/Magento/Backend/Block/Widget/Tabs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index 91bdc0bf967d2..cece1033b88b1 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -238,7 +238,7 @@ protected function _beforeToHtml()
         $this->_tabs = $this->reorderTabs();
         
         if ($this->_activeTab === null) {
-            /** @var  $tab */
+            /** @var TabInterface $tab */
             foreach ($this->_tabs as $tab) {
                 $this->_activeTab = $tab->getId();
                 break;
@@ -309,7 +309,7 @@ protected function reorderTabs()
     
         $ordered = [];
         
-        /** @var  $tab */
+        /** @var TabInterface $tab */
         foreach ($orderByPosition as $tab) {
             $ordered[$tab->getId()] = $tab;
         }

From 9301ccbf4d2c018304bbaad846ca39a8d939373c Mon Sep 17 00:00:00 2001
From: Tiago Sampaio <tiago@tiagosampaio.com>
Date: Fri, 22 Jun 2018 15:45:25 -0300
Subject: [PATCH 062/127] Better way to retrieve the first tab ID if active tab
 is empty.

---
 app/code/Magento/Backend/Block/Widget/Tabs.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index cece1033b88b1..8e57e063de44d 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -237,19 +237,16 @@ protected function _beforeToHtml()
     {
         $this->_tabs = $this->reorderTabs();
         
-        if ($this->_activeTab === null) {
-            /** @var TabInterface $tab */
-            foreach ($this->_tabs as $tab) {
-                $this->_activeTab = $tab->getId();
-                break;
-            }
-        }
-        
         if ($activeTab = $this->getRequest()->getParam('active_tab')) {
             $this->setActiveTab($activeTab);
         } elseif ($activeTabId = $this->_authSession->getActiveTabId()) {
             $this->_setActiveTab($activeTabId);
         }
+
+        if ($this->_activeTab === null && !empty($this->_tabs)) {
+            /** @var TabInterface $tab */
+            $this->_activeTab = (reset($this->_tabs))->getId();
+        }
         
         $this->assign('tabs', $this->_tabs);
         return parent::_beforeToHtml();
@@ -259,7 +256,7 @@ protected function _beforeToHtml()
     /**
      * @return array
      */
-    protected function reorderTabs()
+    private function reorderTabs()
     {
         $orderByIdentity = [];
         $orderByPosition = [];

From c2b5c7a586672a2633b746758a7adb124a2e1947 Mon Sep 17 00:00:00 2001
From: Tiago Sampaio <tiago@tiagosampaio.com>
Date: Fri, 22 Jun 2018 16:12:43 -0300
Subject: [PATCH 063/127] Sort order was split into few private methods.

---
 .../Magento/Backend/Block/Widget/Tabs.php     | 48 ++++++++++++++-----
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index 8e57e063de44d..c9c3c8418074a 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -254,14 +254,15 @@ protected function _beforeToHtml()
     
     
     /**
+     * Reorder the tabs.
+     *
      * @return array
      */
     private function reorderTabs()
     {
         $orderByIdentity = [];
         $orderByPosition = [];
-        
-        $position  = 100;
+        $position        = 100;
     
         /**
          * Set the initial positions for each tab.
@@ -277,9 +278,21 @@ private function reorderTabs()
             
             $position += 100;
         }
-        
+
+        return $this->applyTabsCorrectOrder($orderByPosition, $orderByIdentity);
+    }
+
+
+    /**
+     * @param array $orderByPosition
+     * @param array $orderByIdentity
+     *
+     * @return array
+     */
+    private function applyTabsCorrectOrder(array $orderByPosition, array $orderByIdentity)
+    {
         $positionFactor = 1;
-        
+
         /**
          * Rearrange the positions by using the after tag for each tab.
          *
@@ -291,26 +304,39 @@ private function reorderTabs()
                 $positionFactor = 1;
                 continue;
             }
-            
+
             $grandPosition = $orderByIdentity[$tab->getAfter()]->getPosition();
             $newPosition   = $grandPosition + $positionFactor;
-            
+
             unset($orderByPosition[$position]);
             $orderByPosition[$newPosition] = $tab;
             $tab->setPosition($newPosition);
-    
+
             $positionFactor++;
         }
-        
+
+        return $this->finalTabsSortOrder($orderByPosition);
+    }
+
+
+    /**
+     * Apply the last sort order to tabs.
+     *
+     * @param array $orderByPosition
+     *
+     * @return array
+     */
+    private function finalTabsSortOrder(array $orderByPosition)
+    {
         ksort($orderByPosition);
-    
+
         $ordered = [];
-        
+
         /** @var TabInterface $tab */
         foreach ($orderByPosition as $tab) {
             $ordered[$tab->getId()] = $tab;
         }
-        
+
         return $ordered;
     }
     

From 024384adfb612151477e60af6b2ed2815cc08496 Mon Sep 17 00:00:00 2001
From: Tiago Sampaio <tiago@tiagosampaio.com>
Date: Tue, 26 Jun 2018 20:00:48 -0300
Subject: [PATCH 064/127] Removing multiple lines.

---
 app/code/Magento/Backend/Block/Widget/Tabs.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index c9c3c8418074a..252c966f58055 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -252,7 +252,6 @@ protected function _beforeToHtml()
         return parent::_beforeToHtml();
     }
     
-    
     /**
      * Reorder the tabs.
      *
@@ -340,7 +339,6 @@ private function finalTabsSortOrder(array $orderByPosition)
         return $ordered;
     }
     
-
     /**
      * @return string
      */

From 3eadcc4b3fb8e15e91fd7d6fd919bcc36d47c59d Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com>
Date: Wed, 27 Jun 2018 08:18:14 +0300
Subject: [PATCH 065/127] MAGETWO-90070: Image uploader improvements

---
 app/code/Magento/Catalog/Model/ImageUploader.php |  1 -
 .../Magento/Cms/Model/Wysiwyg/Images/Storage.php |  6 +++---
 .../Unit/Model/Wysiwyg/Images/StorageTest.php    | 12 ++++--------
 .../Magento/Catalog/Model/ImageUploaderTest.php  | 16 ++++++++++++----
 lib/internal/Magento/Framework/File/Mime.php     |  4 ++--
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/ImageUploader.php b/app/code/Magento/Catalog/Model/ImageUploader.php
index 0c60e5b38a96e..ce92a2c1d958d 100644
--- a/app/code/Magento/Catalog/Model/ImageUploader.php
+++ b/app/code/Magento/Catalog/Model/ImageUploader.php
@@ -230,7 +230,6 @@ public function moveFileFromTmp($imageName)
      * @return string[]
      *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Exception
      */
     public function saveFileToTmpDir($fileId)
     {
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index 1ba6e5be5bcb6..9e095fb6cdec4 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -478,7 +478,6 @@ public function deleteFile($target)
      * @param string $type Type of storage, e.g. image, media etc.
      * @return array File info Array
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Exception
      */
     public function uploadFile($targetPath, $type = null)
     {
@@ -757,7 +756,7 @@ protected function _getRelativePathToRoot($path)
     }
 
     /**
-     * Prepare mime types config settings
+     * Prepare mime types config settings.
      *
      * @param string|null $type Type of storage, e.g. image, media etc.
      * @return array Array of allowed file extensions
@@ -770,7 +769,7 @@ private function getAllowedMimeTypes($type = null): array
     }
 
     /**
-     * Get list of allowed file extensions with mime type in values
+     * Get list of allowed file extensions with mime type in values.
      *
      * @param string|null $type
      * @return array
@@ -782,6 +781,7 @@ private function getExtensionsList($type = null): array
         } else {
             $allowed = $this->_extensions['allowed'];
         }
+
         return $allowed;
     }
 }
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
index 6b24db3141030..2dc98bcefb961 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
@@ -250,26 +250,22 @@ public function testGetResizeHeight()
 
     /**
      * @covers \Magento\Cms\Model\Wysiwyg\Images\Storage::deleteDirectory
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Directory /storage/some/another/dir is not under storage root path.
      */
     public function testDeleteDirectoryOverRoot()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            sprintf('Directory %s is not under storage root path.', self::INVALID_DIRECTORY_OVER_ROOT)
-        );
         $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
         $this->imagesStorage->deleteDirectory(self::INVALID_DIRECTORY_OVER_ROOT);
     }
 
     /**
      * @covers \Magento\Cms\Model\Wysiwyg\Images\Storage::deleteDirectory
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage We can't delete root directory /storage/root/dir right now.
      */
     public function testDeleteRootDirectory()
     {
-        $this->expectException(
-            \Magento\Framework\Exception\LocalizedException::class,
-            sprintf('We can\'t delete root directory %s right now.', self::STORAGE_ROOT_DIR)
-        );
         $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
         $this->imagesStorage->deleteDirectory(self::STORAGE_ROOT_DIR);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
index 723ff963e2bfc..50b40cf4f2efb 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
@@ -34,6 +34,9 @@ class ImageUploaderTest extends \PHPUnit\Framework\TestCase
      */
     private $mediaDirectory;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -46,12 +49,15 @@ protected function setUp()
             [
                 'baseTmpPath' => $this->mediaDirectory->getRelativePath('tmp'),
                 'basePath' => __DIR__,
-                'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png']
+                'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
             ]
         );
     }
 
-    public function testSaveFileToTmpDir()
+    /**
+     * @return void
+     */
+    public function testSaveFileToTmpDir(): void
     {
         $fileName = 'magento_small_image.jpg';
         $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
@@ -75,8 +81,9 @@ public function testSaveFileToTmpDir()
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage File validation failed.
+     * @return void
      */
-    public function testSaveFileToTmpDirWithWrongExtension()
+    public function testSaveFileToTmpDirWithWrongExtension(): void
     {
         $fileName = 'text.txt';
         $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
@@ -100,8 +107,9 @@ public function testSaveFileToTmpDirWithWrongExtension()
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage File validation failed.
+     * @return void
      */
-    public function testSaveFileToTmpDirWithWrongFile()
+    public function testSaveFileToTmpDirWithWrongFile(): void
     {
         $fileName = 'file.gif';
         $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
diff --git a/lib/internal/Magento/Framework/File/Mime.php b/lib/internal/Magento/Framework/File/Mime.php
index 8f89903f5dd13..d42b536f450ce 100644
--- a/lib/internal/Magento/Framework/File/Mime.php
+++ b/lib/internal/Magento/Framework/File/Mime.php
@@ -59,7 +59,7 @@ class Mime
     ];
 
     /**
-     * List of mime types that can be defined by file extension
+     * List of mime types that can be defined by file extension.
      *
      * @var array $defineByExtensionList
      */
@@ -125,7 +125,7 @@ private function getNativeMimeType(string $file): string
     }
 
     /**
-     * Get file extension by file name
+     * Get file extension by file name.
      *
      * @param string $file
      * @return string

From d35b094fb9152de81a76af474ba62358be854da3 Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Wed, 27 Jun 2018 12:33:52 +0530
Subject: [PATCH 066/127] Update Tabs.php

---
 app/code/Magento/Backend/Block/Widget/Tabs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index 252c966f58055..4088d1e0c3800 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -117,7 +117,7 @@ public function addTab($tabId, $tab)
         if (empty($tabId)) {
             throw new \Exception(__('Please correct the tab configuration and try again. Tab Id should be not empty'));
         }
-        
+
         if (is_array($tab)) {
             $this->_tabs[$tabId] = new \Magento\Framework\DataObject($tab);
         } elseif ($tab instanceof \Magento\Framework\DataObject) {

From 63cc8e630df033191fd9447e997f7f38b7504be1 Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Wed, 27 Jun 2018 14:19:29 +0530
Subject: [PATCH 067/127] Fixed multiple empty lines issue

---
 app/code/Magento/Backend/Block/Widget/Tabs.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index 4088d1e0c3800..333904e398cf5 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -281,7 +281,6 @@ private function reorderTabs()
         return $this->applyTabsCorrectOrder($orderByPosition, $orderByIdentity);
     }
 
-
     /**
      * @param array $orderByPosition
      * @param array $orderByIdentity
@@ -317,7 +316,6 @@ private function applyTabsCorrectOrder(array $orderByPosition, array $orderByIde
         return $this->finalTabsSortOrder($orderByPosition);
     }
 
-
     /**
      * Apply the last sort order to tabs.
      *

From 75cec3589eef295f364a24f28c33fc408af56221 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 27 Jun 2018 12:31:45 +0300
Subject: [PATCH 068/127] MAGETWO-90301: Extend MFTF tests to check Checkout
 Success page

---
 .../Checkout/Test/CheckCheckoutSuccessPageTest.xml              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
index 89fafcd8bd9d8..caa77ae9911ad 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
@@ -114,9 +114,11 @@
         <!--Check "Print Receipt" button is presented (desktop only)-->
         <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint"/>
         <resizeWindow width="600" height="800" stepKey="resizeWindow"/>
+        <wait time="3" stepKey="waitForWindowResizing1"/>
         <waitForElementNotVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitInvisiblePrint"/>
         <dontSeeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeInvisiblePrint"/>
         <maximizeWindow stepKey="maximizeWindowKey1"/>
+        <wait time="3" stepKey="waitForWindowResizing2"/>
         <waitForElementVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitVisiblePrint"/>
         <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint2" />
 

From 33f096e4dc622fbcbfbac0b98aa446c2d0cc9dfe Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Wed, 27 Jun 2018 12:39:32 +0300
Subject: [PATCH 069/127] MAGETWO-89609: [Backport for 2.2.x] Improve import
 files validation

---
 .../CatalogImportExport/Model/Import/UploaderTest.php       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
index 980f6bc53e91e..cf5cb69ebdc27 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
@@ -55,8 +55,9 @@ protected function setUp()
 
     /**
      * @magentoAppIsolation enabled
+     * @return void
      */
-    public function testMoveWithValidFile() : void
+    public function testMoveWithValidFile(): void
     {
         $fileName = 'magento_additional_image_one.jpg';
         $filePath = $this->directory->getAbsolutePath($this->uploader->getTmpDir() . '/' . $fileName);
@@ -67,9 +68,10 @@ public function testMoveWithValidFile() : void
 
     /**
      * @magentoAppIsolation enabled
+     * @return void
      * @expectedException \Exception
      */
-    public function testMoveWithInvalidFile() :void
+    public function testMoveWithInvalidFile(): void
     {
         $fileName = 'media_import_image.php';
         $filePath = $this->directory->getAbsolutePath($this->uploader->getTmpDir() . '/' . $fileName);

From bad70a177284286f1ad45ab8b975469e46957c5c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 27 Jun 2018 16:51:22 +0300
Subject: [PATCH 070/127] MAGETWO-90301: Extend MFTF tests to check Checkout
 Success page

---
 .../Checkout/Test/CheckCheckoutSuccessPageTest.xml            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
index caa77ae9911ad..326d233c91395 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
@@ -114,11 +114,11 @@
         <!--Check "Print Receipt" button is presented (desktop only)-->
         <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint"/>
         <resizeWindow width="600" height="800" stepKey="resizeWindow"/>
-        <wait time="3" stepKey="waitForWindowResizing1"/>
+        <wait time="10" stepKey="waitForWindowResizing1"/>
         <waitForElementNotVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitInvisiblePrint"/>
         <dontSeeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeInvisiblePrint"/>
         <maximizeWindow stepKey="maximizeWindowKey1"/>
-        <wait time="3" stepKey="waitForWindowResizing2"/>
+        <wait time="10" stepKey="waitForWindowResizing2"/>
         <waitForElementVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitVisiblePrint"/>
         <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint2" />
 

From c312a5feb5f6479dde18d10f59cb44c6aff1523f Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@magento.com>
Date: Wed, 27 Jun 2018 12:14:36 -0500
Subject: [PATCH 071/127] MAGETWO-91555: Admin orders can result in a customer
 with an example email address

- addressing jenkins failure
---
 .../Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml | 3 ++-
 .../Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml     | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
index 1b4d9372cb509..8bdfc678e4560 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
@@ -35,8 +35,9 @@
 
         <!--Create Store view -->
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-        <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
+        <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="clickCreateStoreViewButton"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitFornewStorePageToOpen" after="clickCreateStoreViewButton"/>
         <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
         <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
         <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
index e938bee27eb47..49f0e9e362ce0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
@@ -18,7 +18,6 @@
             <testCaseId value="MAGETWO-91436"/>
             <group value="product"/>
         </annotations>
-        <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!--Create new website -->
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
@@ -46,7 +45,7 @@
             <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="AcceptNewStoreViewCreation"/>
             <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/>
             <see userInput="You saved the store view." stepKey="seeSaveMessage" />
-        </before>
+
         <after>
             <actionGroup ref="ResetWebUrlOptions" stepKey="resetUrlOption"/>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">

From c8a0fd6def0864a86bdc9764ae20c55aa2b5e124 Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Tue, 26 Jun 2018 20:06:16 +0300
Subject: [PATCH 072/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Magento/Framework/Code/GeneratorTest.php  | 51 +++++++++++++++----
 generated/.htaccess                           |  0
 .../Magento/Framework/Code/Generator.php      |  7 ++-
 .../Code/Generator/EntityAbstract.php         | 10 ++++
 .../Unit/Generator/EntityAbstractTest.php     | 45 ++++++++++++++++
 .../Code/Test/Unit/GeneratorTest.php          | 47 ++++++++++++++++-
 6 files changed, 146 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 generated/.htaccess

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
index d74a83c339326..ae1edf421713c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Code\Generator;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
 use Magento\Framework\Interception\Code\Generator as InterceptionGenerator;
 use Magento\Framework\ObjectManager\Code\Generator as DIGenerator;
 use Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceFactoryGenerator;
@@ -36,20 +37,25 @@ class GeneratorTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Framework\Filesystem\Directory\Write
      */
-    protected $varDirectory;
+    protected $generatedDirectory;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\Read
+     */
+    protected $logDirectory;
 
     protected function setUp()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->varDirectory = $objectManager->get(
-            \Magento\Framework\Filesystem::class
-        )->getDirectoryWrite(
-            DirectoryList::VAR_DIR
-        );
-        $generationDirectory = $this->varDirectory->getAbsolutePath('generation');
+        /** @var Filesystem $filesystem */
+        $filesystem = $objectManager->get(\Magento\Framework\Filesystem::class);
+        $this->generatedDirectory = $filesystem->getDirectoryWrite(DirectoryList::GENERATED_CODE);
+        $this->logDirectory = $filesystem->getDirectoryRead(DirectoryList::LOG);
+        $this->generatedDirectory->create();
+        $generatedDirectory = $this->generatedDirectory->getAbsolutePath();
         $this->_ioObject = new \Magento\Framework\Code\Generator\Io(
             new \Magento\Framework\Filesystem\Driver\File(),
-            $generationDirectory
+            $generatedDirectory
         );
         $this->_generator = $objectManager->create(
             \Magento\Framework\Code\Generator::class,
@@ -70,7 +76,8 @@ protected function setUp()
 
     protected function tearDown()
     {
-        $this->varDirectory->delete('generation');
+        $this->generatedDirectory->changePermissionsRecursively('./', 0777, 0666);
+        $this->generatedDirectory->delete();
         $this->_generator = null;
     }
 
@@ -163,8 +170,8 @@ public function testGenerateClassInterceptorWithNamespace()
     public function testGenerateClassExtensionAttributesInterfaceFactoryWithNamespace()
     {
         $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'ExtensionInterfaceFactory';
-        $this->varDirectory->create(
-            $this->varDirectory->getAbsolutePath('generation') . '/Magento/Framework/Code/GeneratorTest/'
+        $this->generatedDirectory->create(
+            $this->generatedDirectory->getAbsolutePath() . '/Magento/Framework/Code/GeneratorTest/'
         );
 
         $generatorResult = $this->_generator->generateClass($factoryClassName);
@@ -185,4 +192,26 @@ public function testGenerateClassExtensionAttributesInterfaceFactoryWithNamespac
         );
         $this->assertEquals($expectedContent, $content);
     }
+
+    public function testGeneratorClassWithErrorSaveClassFile()
+    {
+        $exceptionMessageRegExp = '/Error: an object of a generated class may be a dependency for another object, '
+            . 'but this dependency has not been defined or set correctly in the signature of the related construct '
+            . 'method\.\nDue to the current error, executing the CLI commands `bin\/magento setup:di:compile` '
+            . 'or `bin\/magento deploy:mode:set production` does not create the required generated classes\.\nMagento '
+            . 'cannot write a class file to the "generated" directory that is read\-only\. Before using the read-only '
+            . 'file system, the classes to be generated must be created beforehand in the "generated" directory\.\n'
+            . 'For details, see the "File systems access permissions" topic at http:\/\/devdocs\.magento\.com\.\n'
+            . 'The specified ".*" file couldn\'t be written.  in \[.*\]/';
+
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessageRegExp($exceptionMessageRegExp);
+        $this->generatedDirectory->changePermissionsRecursively('./', 0555, 0444);
+        $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'ExtensionInterfaceFactory';
+
+        $generatorResult = $this->_generator->generateClass($factoryClassName);
+        $this->assertFalse($generatorResult);
+        $pathToSystemLog =  $this->logDirectory->getAbsolutePath('system.log');
+        $this->assertRegexp($exceptionMessageRegExp, file_get_contents($pathToSystemLog));
+    }
 }
diff --git a/generated/.htaccess b/generated/.htaccess
old mode 100644
new mode 100755
diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index a845712b46598..46299ebee9813 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Code\Generator\DefinedClasses;
 use Magento\Framework\Code\Generator\EntityAbstract;
+use Psr\Log\LoggerInterface;
 
 class Generator
 {
@@ -111,8 +112,12 @@ public function generateClass($className)
         if ($generator !== null) {
             $this->tryToLoadSourceClass($className, $generator);
             if (!($file = $generator->generate())) {
+                /** @var $logger LoggerInterface */
+                $logger = $this->objectManager->get(LoggerInterface::class);
                 $errors = $generator->getErrors();
-                throw new \RuntimeException(implode(' ', $errors) . ' in [' . $className . ']');
+                $message = implode(PHP_EOL, $errors) . ' in [' . $className . ']';
+                $logger->critical($message);
+                throw new \RuntimeException($message);
             }
             if (!$this->definedClasses->isClassLoadableFromMemory($className)) {
                 $this->_ioObject->includeFile($file);
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index 3efe110ccf193..7225ef024387e 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Code\Generator;
 
+use Magento\Framework\Exception\FileSystemException;
 use Zend\Code\Generator\ValueGenerator;
 
 abstract class EntityAbstract
@@ -106,6 +107,15 @@ public function generate()
                     $this->_addError('Can\'t generate source code.');
                 }
             }
+        } catch (FileSystemException $e) {
+            $message = <<<'EOT'
+Error: an object of a generated class may be a dependency for another object, but this dependency has not been defined or set correctly in the signature of the related construct method.
+Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento deploy:mode:set production` does not create the required generated classes.
+Magento cannot write a class file to the "generated" directory that is read-only. Before using the read-only file system, the classes to be generated must be created beforehand in the "generated" directory.
+For details, see the "File systems access permissions" topic at http://devdocs.magento.com.
+EOT;
+            $this->_addError($message);
+            $this->_addError($e->getMessage());
         } catch (\Exception $e) {
             $this->_addError($e->getMessage());
         }
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
index afd784b061a22..6e9b84db0e984 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Code\Test\Unit\Generator;
 
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Phrase;
+
 class EntityAbstractTest extends \PHPUnit\Framework\TestCase
 {
     /**#@+
@@ -209,6 +212,48 @@ public function testGenerate(
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function testGenerateFailure() {
+
+        $infoMessage = <<<'EOT'
+Error: an object of a generated class may be a dependency for another object, but this dependency has not been defined or set correctly in the signature of the related construct method.
+Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento deploy:mode:set production` does not create the required generated classes.
+Magento cannot write a class file to the "generated" directory that is read-only. Before using the read-only file system, the classes to be generated must be created beforehand in the "generated" directory.
+For details, see the "File systems access permissions" topic at http://devdocs.magento.com.
+EOT;
+        $exceptionMessage = 'Some description';
+
+        $abstractGetters = ['_getClassProperties', '_getClassMethods'];
+
+        $arguments = $this->_prepareMocksForGenerateCode(true);
+
+        /** @var \Magento\Framework\Code\Generator\Io|\PHPUnit_Framework_MockObject_MockObject $ioObjectMock */
+        $ioObjectMock = $arguments['io_object'];
+        $ioObjectMock->expects($this->once())
+            ->method('writeResultFile')
+            ->with(self::RESULT_FILE, self::RESULT_CODE)
+            ->willThrowException(new FileSystemException(new Phrase($exceptionMessage)));
+
+        $this->_model = $this->getMockForAbstractClass(
+            \Magento\Framework\Code\Generator\EntityAbstract::class,
+            $arguments,
+            '',
+            true,
+            true,
+            true,
+            $abstractGetters
+        );
+        // we need to mock abstract methods to set correct return value type
+        foreach ($abstractGetters as $methodName) {
+            $this->_model->expects($this->any())->method($methodName)->will($this->returnValue([]));
+        }
+
+        $result = $this->_model->generate();
+        $this->assertFalse($result);
+        $this->assertEquals([$infoMessage, $exceptionMessage], $this->_model->getErrors());
+    }
     /**
      * Prepares mocks for validation verification
      *
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index dfb547ae3d53f..a76b9582906cb 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Framework\Code\Test\Unit;
 
 use Magento\Framework\Code\Generator;
 use Magento\Framework\Code\Generator\DefinedClasses;
 use Magento\Framework\Code\Generator\Io;
+use Psr\Log\LoggerInterface;
 
 class GeneratorTest extends \PHPUnit\Framework\TestCase
 {
@@ -95,7 +95,7 @@ public function testGenerateClassWithWrongName()
     /**
      * @expectedException \RuntimeException
      */
-    public function testGenerateClassWithError()
+    public function testGenerateClassWhenClassIsNotGenerationSuccess()
     {
         $expectedEntities = array_values($this->expectedEntities);
         $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
@@ -108,6 +108,49 @@ public function testGenerateClassWithError()
         $this->model->generateClass($resultClassName);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function testGenerateClassWithErrors()
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage("Some error message 0\nSome error message 1\nSome error message 2");
+        $errorMessages = [
+            'Some error message 0',
+            'Some error message 1',
+            'Some error message 2',
+        ];
+        $expectedEntities = array_values($this->expectedEntities);
+        $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
+        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+        $entityGeneratorMock = $this->getMockBuilder(\Magento\Framework\Code\Generator\EntityAbstract::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggerMock = $this->createMock(LoggerInterface::class);
+
+        $objectManagerMock->expects($this->once())
+            ->method('create')
+            ->willReturn($entityGeneratorMock);
+        $entityGeneratorMock->expects($this->once())
+            ->method('getSourceClassName')
+            ->willReturn(self::SOURCE_CLASS);
+        $this->definedClassesMock->expects($this->once())
+            ->method('isClassLoadable')
+            ->with(self::SOURCE_CLASS)
+            ->willReturn(true);
+        $entityGeneratorMock->expects($this->once())
+            ->method('generate')
+            ->willReturn(false);
+        $objectManagerMock->expects($this->once())
+            ->method('get')
+            ->willReturn($loggerMock);
+        $entityGeneratorMock->expects($this->once())
+            ->method('getErrors')
+            ->willReturn($errorMessages);
+        $this->model->setObjectManager($objectManagerMock);
+        $this->model->generateClass($resultClassName);
+    }
+
     /**
      * @dataProvider trueFalseDataProvider
      */

From c647bfe8235f558b6d65201baa6dfbc14f3f7fbf Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Thu, 28 Jun 2018 16:58:06 -0500
Subject: [PATCH 073/127] MC-2338: 3rd party library/dependency upgrade for 2.3
 pre Alpha

---
 composer.json |  24 +-
 composer.lock | 980 +++++++++++++++++++++++++++++---------------------
 2 files changed, 592 insertions(+), 412 deletions(-)

diff --git a/composer.json b/composer.json
index e2a89ae1207a7..71687f31aa88a 100644
--- a/composer.json
+++ b/composer.json
@@ -29,26 +29,26 @@
         "ext-zip": "*",
         "ext-bcmath": "*",
         "lib-libxml": "*",
-        "braintree/braintree_php": "3.28.0",
+        "braintree/braintree_php": "3.34.0",
         "colinmollenhour/cache-backend-file": "~1.4.1",
-        "colinmollenhour/cache-backend-redis": "1.10.4",
-        "colinmollenhour/credis": "1.9.1",
-        "colinmollenhour/php-redis-session-abstract": "~1.3.8",
+        "colinmollenhour/cache-backend-redis": "1.10.5",
+        "colinmollenhour/credis": "1.10.0",
+        "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.6",
         "elasticsearch/elasticsearch": "~2.0|~5.1",
-        "magento/composer": "~1.3.0",
+        "magento/composer": "dev-MC-2338",
         "magento/magento-composer-installer": ">=0.1.11",
         "magento/zendframework1": "~1.14.0",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
         "pelago/emogrifier": "^2.0.0",
         "php-amqplib/php-amqplib": "~2.7.0",
-        "phpseclib/mcrypt_compat": "1.0.4",
+        "phpseclib/mcrypt_compat": "1.0.5",
         "phpseclib/phpseclib": "2.0.*",
         "ramsey/uuid": "~3.7.3",
-        "symfony/console": "~4.0.0",
-        "symfony/event-dispatcher": "~4.0.0",
-        "symfony/process": "~4.0.0",
+        "symfony/console": "~4.1.0",
+        "symfony/event-dispatcher": "~4.1.0",
+        "symfony/process": "~4.1.0",
         "tedivm/jshrink": "~1.3.0",
         "tubalmartin/cssmin": "4.1.1",
         "webonyx/graphql-php": "^0.11.1",
@@ -81,13 +81,13 @@
         "zendframework/zend-view": "~2.10.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.10.0",
+        "friendsofphp/php-cs-fixer": "~2.12.0",
         "lusitanian/oauth": "~0.8.10",
         "pdepend/pdepend": "2.5.2",
         "phpmd/phpmd": "@stable",
-        "phpunit/phpunit": "~6.2.0",
+        "phpunit/phpunit": "~6.5.0",
         "sebastian/phpcpd": "~3.0.0",
-        "squizlabs/php_codesniffer": "3.2.2"
+        "squizlabs/php_codesniffer": "3.3.0"
     },
     "replace": {
         "magento/module-marketplace": "*",
diff --git a/composer.lock b/composer.lock
index b104cf2929ba7..6e9bcdadbdd61 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,23 +1,23 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "daacd8800615d44aa1af0ac06c1ecc46",
+    "content-hash": "88f0d1a32d247ad565f3b62c37c744a1",
     "packages": [
         {
             "name": "braintree/braintree_php",
-            "version": "3.28.0",
+            "version": "3.34.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/braintree/braintree_php.git",
-                "reference": "f8ab5ca7b3397536de622fc9640e5b257fc33e71"
+                "reference": "fd55c466d0d0088c67705d7ba0b3876d9767bfda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/braintree/braintree_php/zipball/f8ab5ca7b3397536de622fc9640e5b257fc33e71",
-                "reference": "f8ab5ca7b3397536de622fc9640e5b257fc33e71",
+                "url": "https://api.github.com/repos/braintree/braintree_php/zipball/fd55c466d0d0088c67705d7ba0b3876d9767bfda",
+                "reference": "fd55c466d0d0088c67705d7ba0b3876d9767bfda",
                 "shasum": ""
             },
             "require": {
@@ -51,7 +51,7 @@
                 }
             ],
             "description": "Braintree PHP Client Library",
-            "time": "2018-02-08T23:03:34+00:00"
+            "time": "2018-05-21T18:14:47+00:00"
         },
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -88,16 +88,16 @@
         },
         {
             "name": "colinmollenhour/cache-backend-redis",
-            "version": "1.10.4",
+            "version": "1.10.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git",
-                "reference": "6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972"
+                "reference": "91d949e28d939e607484a4bbf9307cff5afa689b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972",
-                "reference": "6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972",
+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/91d949e28d939e607484a4bbf9307cff5afa689b",
+                "reference": "91d949e28d939e607484a4bbf9307cff5afa689b",
                 "shasum": ""
             },
             "require": {
@@ -120,20 +120,20 @@
             ],
             "description": "Zend_Cache backend using Redis with full support for tags.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
-            "time": "2017-10-05T20:50:44+00:00"
+            "time": "2018-05-15T16:02:25+00:00"
         },
         {
             "name": "colinmollenhour/credis",
-            "version": "1.9.1",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/credis.git",
-                "reference": "049ccfb2c680e4dfa6adcfa97f2f29d086919abd"
+                "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/049ccfb2c680e4dfa6adcfa97f2f29d086919abd",
-                "reference": "049ccfb2c680e4dfa6adcfa97f2f29d086919abd",
+                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/8ab6db707c821055f9856b8cf76d5f44beb6fd8a",
+                "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a",
                 "shasum": ""
             },
             "require": {
@@ -160,20 +160,20 @@
             ],
             "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
             "homepage": "https://github.com/colinmollenhour/credis",
-            "time": "2017-10-05T20:28:58+00:00"
+            "time": "2018-05-07T14:45:04+00:00"
         },
         {
             "name": "colinmollenhour/php-redis-session-abstract",
-            "version": "v1.3.8",
+            "version": "v1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
-                "reference": "9f69f5c1be512d5ff168e731e7fa29ab2905d847"
+                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/9f69f5c1be512d5ff168e731e7fa29ab2905d847",
-                "reference": "9f69f5c1be512d5ff168e731e7fa29ab2905d847",
+                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
+                "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc",
                 "shasum": ""
             },
             "require": {
@@ -197,7 +197,7 @@
             ],
             "description": "A Redis-based session handler with optimistic locking",
             "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-            "time": "2018-01-08T14:53:13+00:00"
+            "time": "2018-03-29T15:54:15+00:00"
         },
         {
             "name": "composer/ca-bundle",
@@ -257,16 +257,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "1.6.4",
+            "version": "1.6.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "86ad51e8a3c64c9782446aae740a61fc6faa2522"
+                "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/86ad51e8a3c64c9782446aae740a61fc6faa2522",
-                "reference": "86ad51e8a3c64c9782446aae740a61fc6faa2522",
+                "url": "https://api.github.com/repos/composer/composer/zipball/b184a92419cc9a9c4c6a09db555a94d441cb11c9",
+                "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9",
                 "shasum": ""
             },
             "require": {
@@ -284,6 +284,9 @@
                 "symfony/finder": "^2.7 || ^3.0 || ^4.0",
                 "symfony/process": "^2.7 || ^3.0 || ^4.0"
             },
+            "conflict": {
+                "symfony/console": "2.8.38"
+            },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.35 || ^5.7",
                 "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
@@ -330,7 +333,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2018-04-13T10:04:24+00:00"
+            "time": "2018-05-04T09:44:59+00:00"
         },
         {
             "name": "composer/semver",
@@ -396,16 +399,16 @@
         },
         {
             "name": "composer/spdx-licenses",
-            "version": "1.3.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30"
+                "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7e111c50db92fa2ced140f5ba23b4e261bc77a30",
-                "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b",
+                "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b",
                 "shasum": ""
             },
             "require": {
@@ -453,7 +456,7 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2018-01-31T13:17:27+00:00"
+            "time": "2018-04-30T10:33:04+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -710,22 +713,22 @@
         },
         {
             "name": "magento/composer",
-            "version": "1.3.0",
+            "version": "dev-MC-2338",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/composer.git",
-                "reference": "38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92"
+                "reference": "7fadf1404ea221d8935003e75ad490b31f28bf34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/composer/zipball/38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92",
-                "reference": "38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92",
+                "url": "https://api.github.com/repos/magento/composer/zipball/7fadf1404ea221d8935003e75ad490b31f28bf34",
+                "reference": "7fadf1404ea221d8935003e75ad490b31f28bf34",
                 "shasum": ""
             },
             "require": {
                 "composer/composer": "^1.6",
                 "php": "~7.1.3|~7.2.0",
-                "symfony/console": "~4.0.0"
+                "symfony/console": "~4.0.0 || ~4.1.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "~7.0.0"
@@ -742,7 +745,7 @@
                 "AFL-3.0"
             ],
             "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-            "time": "2018-03-26T16:19:52+00:00"
+            "time": "2018-06-28T21:28:52+00:00"
         },
         {
             "name": "magento/magento-composer-installer",
@@ -1022,16 +1025,16 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.12",
+            "version": "v2.0.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
+                "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
-                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09",
+                "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09",
                 "shasum": ""
             },
             "require": {
@@ -1063,10 +1066,11 @@
             "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
             "keywords": [
                 "csprng",
+                "polyfill",
                 "pseudorandom",
                 "random"
             ],
-            "time": "2018-04-04T21:24:14+00:00"
+            "time": "2018-06-08T15:26:40+00:00"
         },
         {
             "name": "pelago/emogrifier",
@@ -1210,21 +1214,21 @@
         },
         {
             "name": "phpseclib/mcrypt_compat",
-            "version": "1.0.4",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/mcrypt_compat.git",
-                "reference": "034ee0e920c70b589196d0bb0a7e8babae5fce08"
+                "reference": "9646c46c7286284bd6c774b0c02f172fa302b879"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/034ee0e920c70b589196d0bb0a7e8babae5fce08",
-                "reference": "034ee0e920c70b589196d0bb0a7e8babae5fce08",
+                "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/9646c46c7286284bd6c774b0c02f172fa302b879",
+                "reference": "9646c46c7286284bd6c774b0c02f172fa302b879",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
-                "phpseclib/phpseclib": "~2.0"
+                "phpseclib/phpseclib": ">=2.0.10 <3.0.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.35|^5.7|^6.0"
@@ -1255,7 +1259,7 @@
                 "encryption",
                 "mcrypt"
             ],
-            "time": "2018-01-13T23:07:52+00:00"
+            "time": "2018-04-15T18:49:21+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
@@ -1577,16 +1581,16 @@
         },
         {
             "name": "react/promise",
-            "version": "v2.5.1",
+            "version": "v2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/promise.git",
-                "reference": "62785ae604c8d69725d693eb370e1d67e94c4053"
+                "reference": "f4edc2581617431aea50430749db55cc3fc031b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/62785ae604c8d69725d693eb370e1d67e94c4053",
-                "reference": "62785ae604c8d69725d693eb370e1d67e94c4053",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/f4edc2581617431aea50430749db55cc3fc031b3",
+                "reference": "f4edc2581617431aea50430749db55cc3fc031b3",
                 "shasum": ""
             },
             "require": {
@@ -1619,7 +1623,7 @@
                 "promise",
                 "promises"
             ],
-            "time": "2017-03-25T12:08:31+00:00"
+            "time": "2018-06-13T15:59:06+00:00"
         },
         {
             "name": "seld/cli-prompt",
@@ -1764,16 +1768,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64"
+                "reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/aad9a6fe47319f22748fd764f52d3a7ca6fa6b64",
-                "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64",
+                "url": "https://api.github.com/repos/symfony/console/zipball/70591cda56b4b47c55776ac78e157c4bb6c8b43f",
+                "reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f",
                 "shasum": ""
             },
             "require": {
@@ -1793,7 +1797,7 @@
                 "symfony/process": "~3.4|~4.0"
             },
             "suggest": {
-                "psr/log": "For using the console logger",
+                "psr/log-implementation": "For using the console logger",
                 "symfony/event-dispatcher": "",
                 "symfony/lock": "",
                 "symfony/process": ""
@@ -1801,7 +1805,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1828,20 +1832,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-03T05:24:00+00:00"
+            "time": "2018-05-31T10:17:53+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "63353a71073faf08f62caab4e6889b06a787f07b"
+                "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/63353a71073faf08f62caab4e6889b06a787f07b",
-                "reference": "63353a71073faf08f62caab4e6889b06a787f07b",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5",
+                "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5",
                 "shasum": ""
             },
             "require": {
@@ -1864,7 +1868,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1891,29 +1895,30 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-06T07:35:43+00:00"
+            "time": "2018-04-06T07:35:57+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21"
+                "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21",
-                "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/562bf7005b55fd80d26b582d28e3e10f2dd5ae9c",
+                "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": "^7.1.3",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1940,20 +1945,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-22T10:50:29+00:00"
+            "time": "2018-05-30T07:26:09+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49"
+                "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49",
-                "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/84714b8417d19e4ba02ea78a41a975b3efaafddb",
+                "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb",
                 "shasum": ""
             },
             "require": {
@@ -1962,7 +1967,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -1989,20 +1994,75 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-04T05:10:37+00:00"
+            "time": "2018-06-19T21:38:16+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "time": "2018-04-30T19:57:29+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.7.0",
+            "version": "v1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
+                "reference": "3296adf6a6454a050679cde90f95350ad604b171"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
-                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
+                "reference": "3296adf6a6454a050679cde90f95350ad604b171",
                 "shasum": ""
             },
             "require": {
@@ -2014,7 +2074,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "1.8-dev"
                 }
             },
             "autoload": {
@@ -2048,20 +2108,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-01-30T19:27:44+00:00"
+            "time": "2018-04-26T10:06:28+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25"
+                "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25",
-                "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25",
+                "url": "https://api.github.com/repos/symfony/process/zipball/1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
+                "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
                 "shasum": ""
             },
             "require": {
@@ -2070,7 +2130,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -2097,7 +2157,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-03T05:24:00+00:00"
+            "time": "2018-05-31T10:17:53+00:00"
         },
         {
             "name": "tedivm/jshrink",
@@ -2145,6 +2205,52 @@
             ],
             "time": "2017-12-08T00:59:56+00:00"
         },
+        {
+            "name": "true/punycode",
+            "version": "v2.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/true/php-punycode.git",
+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "symfony/polyfill-mbstring": "^1.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.7",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "TrueBV\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Renan Gonçalves",
+                    "email": "renan.saddam@gmail.com"
+                }
+            ],
+            "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)",
+            "homepage": "https://github.com/true/php-punycode",
+            "keywords": [
+                "idna",
+                "punycode"
+            ],
+            "time": "2016-11-16T10:37:54+00:00"
+        },
         {
             "name": "tubalmartin/cssmin",
             "version": "v4.1.1",
@@ -2200,16 +2306,16 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v0.11.5",
+            "version": "v0.11.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "b97cad0f4a50131c85d9224e8e36ebbcf1c6b425"
+                "reference": "f438a726cd523bc584e78d866eca270165c42fd5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/b97cad0f4a50131c85d9224e8e36ebbcf1c6b425",
-                "reference": "b97cad0f4a50131c85d9224e8e36ebbcf1c6b425",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/f438a726cd523bc584e78d866eca270165c42fd5",
+                "reference": "f438a726cd523bc584e78d866eca270165c42fd5",
                 "shasum": ""
             },
             "require": {
@@ -2235,7 +2341,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD"
+                "MIT"
             ],
             "description": "A PHP port of GraphQL reference implementation",
             "homepage": "https://github.com/webonyx/graphql-php",
@@ -2243,33 +2349,33 @@
                 "api",
                 "graphql"
             ],
-            "time": "2017-12-12T09:03:21+00:00"
+            "time": "2018-04-17T10:34:43+00:00"
         },
         {
             "name": "zendframework/zend-captcha",
-            "version": "2.7.1",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-captcha.git",
-                "reference": "2d56293a5ae3e45e7c8ee7030aa8b305768d8014"
+                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/2d56293a5ae3e45e7c8ee7030aa8b305768d8014",
-                "reference": "2d56293a5ae3e45e7c8ee7030aa8b305768d8014",
+                "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
+                "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",
-                "zendframework/zend-math": "^2.6 || ^3.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
+                "zendframework/zend-math": "^2.7 || ^3.0",
+                "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
                 "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-session": "^2.6",
+                "zendframework/zend-session": "^2.8",
                 "zendframework/zend-text": "^2.6",
-                "zendframework/zend-validator": "^2.6",
+                "zendframework/zend-validator": "^2.10.1",
                 "zendframework/zendservice-recaptcha": "^3.0"
             },
             "suggest": {
@@ -2282,8 +2388,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 }
             },
             "autoload": {
@@ -2295,12 +2401,13 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-captcha",
+            "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
             "keywords": [
+                "ZendFramework",
                 "captcha",
-                "zf2"
+                "zf"
             ],
-            "time": "2017-02-23T08:09:44+00:00"
+            "time": "2018-04-24T17:24:10+00:00"
         },
         {
             "name": "zendframework/zend-code",
@@ -2621,16 +2728,16 @@
         },
         {
             "name": "zendframework/zend-diactoros",
-            "version": "1.7.1",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-diactoros.git",
-                "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1"
+                "reference": "11c9c1835e60eef6f9234377a480fcec096ebd9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/bf26aff803a11c5cc8eb7c4878a702c403ec67f1",
-                "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1",
+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/11c9c1835e60eef6f9234377a480fcec096ebd9e",
+                "reference": "11c9c1835e60eef6f9234377a480fcec096ebd9e",
                 "shasum": ""
             },
             "require": {
@@ -2649,11 +2756,22 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7.x-dev",
-                    "dev-develop": "1.8.x-dev"
+                    "dev-master": "1.8.x-dev",
+                    "dev-develop": "1.9.x-dev",
+                    "dev-release-2.0": "2.0.x-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/functions/create_uploaded_file.php",
+                    "src/functions/marshal_headers_from_sapi.php",
+                    "src/functions/marshal_method_from_sapi.php",
+                    "src/functions/marshal_protocol_version_from_sapi.php",
+                    "src/functions/marshal_uri_from_sapi.php",
+                    "src/functions/normalize_server.php",
+                    "src/functions/normalize_uploaded_files.php",
+                    "src/functions/parse_cookie_header.php"
+                ],
                 "psr-4": {
                     "Zend\\Diactoros\\": "src/"
                 }
@@ -2669,34 +2787,34 @@
                 "psr",
                 "psr-7"
             ],
-            "time": "2018-02-26T15:44:50+00:00"
+            "time": "2018-06-27T18:52:43+00:00"
         },
         {
             "name": "zendframework/zend-escaper",
-            "version": "2.5.2",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-escaper.git",
-                "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e"
+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
-                "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
+                "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/31d8aafae982f9568287cb4dce987e6aff8fd074",
+                "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+                "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
                 }
             },
             "autoload": {
@@ -2708,12 +2826,13 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-escaper",
+            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
             "keywords": [
+                "ZendFramework",
                 "escaper",
-                "zf2"
+                "zf"
             ],
-            "time": "2016-06-30T19:48:38+00:00"
+            "time": "2018-04-25T15:48:53+00:00"
         },
         {
             "name": "zendframework/zend-eventmanager",
@@ -2764,16 +2883,16 @@
         },
         {
             "name": "zendframework/zend-feed",
-            "version": "2.9.0",
+            "version": "2.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-feed.git",
-                "reference": "abe88686124d492e0a2a84656f15e5482bfbe030"
+                "reference": "5253f949f4ad999086ab9b408908b6c6776f24db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/abe88686124d492e0a2a84656f15e5482bfbe030",
-                "reference": "abe88686124d492e0a2a84656f15e5482bfbe030",
+                "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/5253f949f4ad999086ab9b408908b6c6776f24db",
+                "reference": "5253f949f4ad999086ab9b408908b6c6776f24db",
                 "shasum": ""
             },
             "require": {
@@ -2802,8 +2921,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.9-dev",
-                    "dev-develop": "2.10-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
                 }
             },
             "autoload": {
@@ -2821,7 +2940,7 @@
                 "feed",
                 "zf"
             ],
-            "time": "2017-12-04T17:59:38+00:00"
+            "time": "2018-06-18T20:14:01+00:00"
         },
         {
             "name": "zendframework/zend-filter",
@@ -2888,16 +3007,16 @@
         },
         {
             "name": "zendframework/zend-form",
-            "version": "2.11.0",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-form.git",
-                "reference": "b68a9f07d93381613b68817091d0505ca94d3363"
+                "reference": "565fb4f4bb3e0dbeea0173c923c4a8be77de9441"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/b68a9f07d93381613b68817091d0505ca94d3363",
-                "reference": "b68a9f07d93381613b68817091d0505ca94d3363",
+                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/565fb4f4bb3e0dbeea0173c923c4a8be77de9441",
+                "reference": "565fb4f4bb3e0dbeea0173c923c4a8be77de9441",
                 "shasum": ""
             },
             "require": {
@@ -2936,8 +3055,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.11.x-dev",
-                    "dev-develop": "2.12.x-dev"
+                    "dev-master": "2.12.x-dev",
+                    "dev-develop": "2.13.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Form",
@@ -2962,20 +3081,20 @@
                 "form",
                 "zf"
             ],
-            "time": "2017-12-06T21:09:08+00:00"
+            "time": "2018-05-16T18:49:44+00:00"
         },
         {
             "name": "zendframework/zend-http",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-http.git",
-                "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa"
+                "reference": "f48b276ffa11b48dd1ae3c6bc306d6ed7958ef51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/78aa510c0ea64bfb2aa234f50c4f232c9531acfa",
-                "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa",
+                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/f48b276ffa11b48dd1ae3c6bc306d6ed7958ef51",
+                "reference": "f48b276ffa11b48dd1ae3c6bc306d6ed7958ef51",
                 "shasum": ""
             },
             "require": {
@@ -2986,15 +3105,18 @@
                 "zendframework/zend-validator": "^2.10.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.4.1 || ^5.7.15",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^3.1 || ^2.6"
             },
+            "suggest": {
+                "paragonie/certainty": "For automated management of cacert.pem"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 }
             },
             "autoload": {
@@ -3006,8 +3128,7 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
-            "homepage": "https://github.com/zendframework/zend-http",
+            "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
             "keywords": [
                 "ZendFramework",
                 "http",
@@ -3015,7 +3136,7 @@
                 "zend",
                 "zf"
             ],
-            "time": "2017-10-13T12:06:24+00:00"
+            "time": "2018-04-26T21:04:50+00:00"
         },
         {
             "name": "zendframework/zend-hydrator",
@@ -3077,24 +3198,24 @@
         },
         {
             "name": "zendframework/zend-i18n",
-            "version": "2.7.4",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-i18n.git",
-                "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31"
+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/d3431e29cc00c2a1c6704e601d4371dbf24f6a31",
-                "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31",
+                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0 || ^5.6",
+                "php": "^5.6 || ^7.0",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
                 "zendframework/zend-cache": "^2.6.1",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^2.6",
@@ -3118,8 +3239,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\I18n",
@@ -3135,25 +3256,26 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-i18n",
+            "description": "Provide translations for your application, and filter and validate internationalized values",
             "keywords": [
+                "ZendFramework",
                 "i18n",
-                "zf2"
+                "zf"
             ],
-            "time": "2017-05-17T17:00:12+00:00"
+            "time": "2018-05-16T16:39:13+00:00"
         },
         {
             "name": "zendframework/zend-inputfilter",
-            "version": "2.8.1",
+            "version": "2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-inputfilter.git",
-                "reference": "55d1430db559e9781b147e73c2c0ce6635d8efe2"
+                "reference": "3f02179e014d9ef0faccda2ad6c65d38adc338d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/55d1430db559e9781b147e73c2c0ce6635d8efe2",
-                "reference": "55d1430db559e9781b147e73c2c0ce6635d8efe2",
+                "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/3f02179e014d9ef0faccda2ad6c65d38adc338d8",
+                "reference": "3f02179e014d9ef0faccda2ad6c65d38adc338d8",
                 "shasum": ""
             },
             "require": {
@@ -3193,7 +3315,7 @@
                 "inputfilter",
                 "zf"
             ],
-            "time": "2018-01-22T19:41:18+00:00"
+            "time": "2018-05-14T17:38:03+00:00"
         },
         {
             "name": "zendframework/zend-json",
@@ -3252,30 +3374,30 @@
         },
         {
             "name": "zendframework/zend-loader",
-            "version": "2.5.1",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-loader.git",
-                "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c"
+                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c",
-                "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c",
+                "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/78f11749ea340f6ca316bca5958eef80b38f9b6c",
+                "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+                "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev",
-                    "dev-develop": "2.6-dev"
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
                 }
             },
             "autoload": {
@@ -3287,12 +3409,13 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-loader",
+            "description": "Autoloading and plugin loading strategies",
             "keywords": [
+                "ZendFramework",
                 "loader",
-                "zf2"
+                "zf"
             ],
-            "time": "2015-06-03T14:05:47+00:00"
+            "time": "2018-04-30T15:20:54+00:00"
         },
         {
             "name": "zendframework/zend-log",
@@ -3367,43 +3490,43 @@
         },
         {
             "name": "zendframework/zend-mail",
-            "version": "2.9.0",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-mail.git",
-                "reference": "067248425f285dec0bdb74256a8f67f9092f115e"
+                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/067248425f285dec0bdb74256a8f67f9092f115e",
-                "reference": "067248425f285dec0bdb74256a8f67f9092f115e",
+                "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/d7beb63d5f7144a21ac100072c453e63860cdab8",
+                "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8",
                 "shasum": ""
             },
             "require": {
                 "ext-iconv": "*",
-                "php": "^7.1",
+                "php": "^5.6 || ^7.0",
+                "true/punycode": "^2.1",
                 "zendframework/zend-loader": "^2.5",
                 "zendframework/zend-mime": "^2.5",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0",
                 "zendframework/zend-validator": "^2.10.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+                "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^2.6",
-                "zendframework/zend-crypt": "^2.6",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+                "zendframework/zend-crypt": "^2.6 || ^3.0",
+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
             },
             "suggest": {
-                "ext-intl": "Handle IDN in AddressList hostnames",
                 "zendframework/zend-crypt": "Crammd5 support in SMTP Auth",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3 when using SMTP to deliver messages"
+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev",
-                    "dev-develop": "2.9-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Mail",
@@ -3419,13 +3542,13 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
-            "homepage": "https://github.com/zendframework/zend-mail",
+            "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
             "keywords": [
+                "ZendFramework",
                 "mail",
-                "zf2"
+                "zf"
             ],
-            "time": "2018-03-01T18:57:00+00:00"
+            "time": "2018-06-07T13:37:07+00:00"
         },
         {
             "name": "zendframework/zend-math",
@@ -3479,16 +3602,16 @@
         },
         {
             "name": "zendframework/zend-mime",
-            "version": "2.7.0",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-mime.git",
-                "reference": "5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f"
+                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f",
-                "reference": "5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f",
+                "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/52ae5fa9f12845cae749271034a2d594f0e4c6f2",
+                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2",
                 "shasum": ""
             },
             "require": {
@@ -3526,7 +3649,7 @@
                 "mime",
                 "zf"
             ],
-            "time": "2017-11-28T15:02:22+00:00"
+            "time": "2018-05-14T19:02:50+00:00"
         },
         {
             "name": "zendframework/zend-modulemanager",
@@ -3590,26 +3713,27 @@
         },
         {
             "name": "zendframework/zend-mvc",
-            "version": "2.7.13",
+            "version": "2.7.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-mvc.git",
-                "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2"
+                "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/9dcaaad145254d023d3cd3559bf29e430f2884b2",
-                "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2",
+                "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
+                "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089",
                 "shasum": ""
             },
             "require": {
                 "container-interop/container-interop": "^1.1",
                 "php": "^5.5 || ^7.0",
-                "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-form": "^2.8.2",
-                "zendframework/zend-hydrator": "^1.1 || ^2.1",
+                "zendframework/zend-console": "^2.7",
+                "zendframework/zend-eventmanager": "^2.6.4 || ^3.0",
+                "zendframework/zend-form": "^2.11",
+                "zendframework/zend-hydrator": "^1.1 || ^2.4",
                 "zendframework/zend-psr7bridge": "^0.2",
-                "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+                "zendframework/zend-servicemanager": "^2.7.10 || ^3.0.3",
                 "zendframework/zend-stdlib": "^2.7.5 || ^3.0"
             },
             "replace": {
@@ -3617,30 +3741,29 @@
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "^4.5",
+                "phpunit/phpunit": "^4.8.36",
+                "sebastian/comparator": "^1.2.4",
                 "sebastian/version": "^1.0.4",
-                "zendframework/zend-authentication": "^2.5.3",
-                "zendframework/zend-cache": "^2.6.1",
-                "zendframework/zend-console": "^2.6",
+                "zendframework/zend-authentication": "^2.6",
+                "zendframework/zend-cache": "^2.8",
                 "zendframework/zend-di": "^2.6",
-                "zendframework/zend-filter": "^2.6.1",
-                "zendframework/zend-http": "^2.5.4",
-                "zendframework/zend-i18n": "^2.6",
-                "zendframework/zend-inputfilter": "^2.6",
+                "zendframework/zend-filter": "^2.8",
+                "zendframework/zend-http": "^2.8",
+                "zendframework/zend-i18n": "^2.8",
+                "zendframework/zend-inputfilter": "^2.8",
                 "zendframework/zend-json": "^2.6.1",
-                "zendframework/zend-log": "^2.7.1",
-                "zendframework/zend-modulemanager": "^2.7.1",
-                "zendframework/zend-serializer": "^2.6.1",
-                "zendframework/zend-session": "^2.6.2",
-                "zendframework/zend-text": "^2.6",
-                "zendframework/zend-uri": "^2.5",
-                "zendframework/zend-validator": "^2.6",
-                "zendframework/zend-view": "^2.6.3"
+                "zendframework/zend-log": "^2.9.3",
+                "zendframework/zend-modulemanager": "^2.8",
+                "zendframework/zend-serializer": "^2.8",
+                "zendframework/zend-session": "^2.8.1",
+                "zendframework/zend-text": "^2.7",
+                "zendframework/zend-uri": "^2.6",
+                "zendframework/zend-validator": "^2.10",
+                "zendframework/zend-view": "^2.9"
             },
             "suggest": {
                 "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
                 "zendframework/zend-config": "Zend\\Config component",
-                "zendframework/zend-console": "Zend\\Console component",
                 "zendframework/zend-di": "Zend\\Di component",
                 "zendframework/zend-filter": "Zend\\Filter component",
                 "zendframework/zend-http": "Zend\\Http component",
@@ -3665,6 +3788,9 @@
                 }
             },
             "autoload": {
+                "files": [
+                    "src/autoload.php"
+                ],
                 "psr-4": {
                     "Zend\\Mvc\\": "src/"
                 }
@@ -3678,7 +3804,7 @@
                 "mvc",
                 "zf2"
             ],
-            "time": "2017-12-14T22:44:10+00:00"
+            "time": "2018-05-03T13:13:41+00:00"
         },
         {
             "name": "zendframework/zend-psr7bridge",
@@ -3731,16 +3857,16 @@
         },
         {
             "name": "zendframework/zend-serializer",
-            "version": "2.8.1",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-serializer.git",
-                "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580"
+                "reference": "0172690db48d8935edaf625c4cba38b79719892c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/7ac42b9a47e9cb23895173a3096bc3b3fb7ac580",
-                "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580",
+                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/0172690db48d8935edaf625c4cba38b79719892c",
+                "reference": "0172690db48d8935edaf625c4cba38b79719892c",
                 "shasum": ""
             },
             "require": {
@@ -3749,10 +3875,9 @@
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "require-dev": {
-                "doctrine/instantiator": "1.0.*",
-                "phpunit/phpunit": "^5.5",
+                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
                 "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-math": "^2.6",
+                "zendframework/zend-math": "^2.6 || ^3.0",
                 "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
             },
             "suggest": {
@@ -3762,8 +3887,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev",
-                    "dev-develop": "2.9-dev"
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Serializer",
@@ -3780,25 +3905,25 @@
                 "BSD-3-Clause"
             ],
             "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
-            "homepage": "https://github.com/zendframework/zend-serializer",
             "keywords": [
+                "ZendFramework",
                 "serializer",
-                "zf2"
+                "zf"
             ],
-            "time": "2017-11-20T22:21:04+00:00"
+            "time": "2018-05-14T18:45:18+00:00"
         },
         {
             "name": "zendframework/zend-server",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-server.git",
-                "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914"
+                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/7cb617ca3e9b24579f544a244ee79ae61f480914",
-                "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914",
+                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/23a2e9a5599c83c05da831cb7c649e8a7809595e",
+                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e",
                 "shasum": ""
             },
             "require": {
@@ -3807,14 +3932,14 @@
                 "zendframework/zend-stdlib": "^2.5 || ^3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8",
-                "squizlabs/php_codesniffer": "^2.3.1"
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+                "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
                 }
             },
             "autoload": {
@@ -3826,25 +3951,26 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-server",
+            "description": "Create Reflection-based RPC servers",
             "keywords": [
+                "ZendFramework",
                 "server",
-                "zf2"
+                "zf"
             ],
-            "time": "2016-06-20T22:27:55+00:00"
+            "time": "2018-04-30T22:21:28+00:00"
         },
         {
             "name": "zendframework/zend-servicemanager",
-            "version": "2.7.10",
+            "version": "2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-servicemanager.git",
-                "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4"
+                "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/ba7069c94c9af93122be9fa31cddd37f7707d5b4",
-                "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4",
+                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
+                "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7",
                 "shasum": ""
             },
             "require": {
@@ -3883,7 +4009,7 @@
                 "servicemanager",
                 "zf2"
             ],
-            "time": "2017-12-05T16:27:36+00:00"
+            "time": "2018-06-22T14:49:54+00:00"
         },
         {
             "name": "zendframework/zend-session",
@@ -4066,33 +4192,33 @@
         },
         {
             "name": "zendframework/zend-text",
-            "version": "2.6.0",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-text.git",
-                "reference": "07ad9388e4d4f12620ad37b52a5b0e4ee7845f92"
+                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/07ad9388e4d4f12620ad37b52a5b0e4ee7845f92",
-                "reference": "07ad9388e4d4f12620ad37b52a5b0e4ee7845f92",
+                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
+                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7.0",
+                "php": "^5.6 || ^7.0",
                 "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+                "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^2.6"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
@@ -4104,34 +4230,35 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "homepage": "https://github.com/zendframework/zend-text",
+            "description": "Create FIGlets and text-based tables",
             "keywords": [
+                "ZendFramework",
                 "text",
-                "zf2"
+                "zf"
             ],
-            "time": "2016-02-08T19:03:52+00:00"
+            "time": "2018-04-30T14:55:10+00:00"
         },
         {
             "name": "zendframework/zend-uri",
-            "version": "2.6.0",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-uri.git",
-                "reference": "fb998b9487ea8c5f4aaac0e536190709bdd5353b"
+                "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/fb998b9487ea8c5f4aaac0e536190709bdd5353b",
-                "reference": "fb998b9487ea8c5f4aaac0e536190709bdd5353b",
+                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/3b6463645c6766f78ce537c70cb4fdabee1e725f",
+                "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",
                 "zendframework/zend-escaper": "^2.5",
-                "zendframework/zend-validator": "^2.5"
+                "zendframework/zend-validator": "^2.10"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.2.1 || ^5.7.15",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
                 "zendframework/zend-coding-standard": "~1.0.0"
             },
             "type": "library",
@@ -4150,13 +4277,13 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
-            "homepage": "https://github.com/zendframework/zend-uri",
+            "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
             "keywords": [
+                "ZendFramework",
                 "uri",
-                "zf2"
+                "zf"
             ],
-            "time": "2018-04-10T17:08:10+00:00"
+            "time": "2018-04-30T13:40:08+00:00"
         },
         {
             "name": "zendframework/zend-validator",
@@ -4318,6 +4445,50 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "composer/xdebug-handler",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/xdebug-handler.git",
+                "reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/c919dc6c62e221fc6406f861ea13433c0aa24f08",
+                "reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0",
+                "psr/log": "^1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Composer\\XdebugHandler\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Stevenson",
+                    "email": "john-stevenson@blueyonder.co.uk"
+                }
+            ],
+            "description": "Restarts a process without xdebug.",
+            "keywords": [
+                "Xdebug",
+                "performance"
+            ],
+            "time": "2018-04-11T15:42:36+00:00"
+        },
         {
             "name": "doctrine/annotations",
             "version": "v1.6.0",
@@ -4496,25 +4667,26 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.10.5",
+            "version": "v2.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "e49993dfb9b96ec8b8d9964c4627599b050a6e99"
+                "reference": "beef6cbe6dec7205edcd143842a49f9a691859a6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/e49993dfb9b96ec8b8d9964c4627599b050a6e99",
-                "reference": "e49993dfb9b96ec8b8d9964c4627599b050a6e99",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/beef6cbe6dec7205edcd143842a49f9a691859a6",
+                "reference": "beef6cbe6dec7205edcd143842a49f9a691859a6",
                 "shasum": ""
             },
             "require": {
                 "composer/semver": "^1.4",
+                "composer/xdebug-handler": "^1.0",
                 "doctrine/annotations": "^1.2",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
                 "php": "^5.6 || >=7.0 <7.3",
-                "php-cs-fixer/diff": "^1.2",
+                "php-cs-fixer/diff": "^1.3",
                 "symfony/console": "^3.2 || ^4.0",
                 "symfony/event-dispatcher": "^3.0 || ^4.0",
                 "symfony/filesystem": "^3.0 || ^4.0",
@@ -4531,16 +4703,20 @@
             "require-dev": {
                 "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
                 "justinrainbow/json-schema": "^5.0",
-                "keradus/cli-executor": "^1.0",
+                "keradus/cli-executor": "^1.1",
                 "mikey179/vfsstream": "^1.6",
-                "php-coveralls/php-coveralls": "^2.0",
+                "php-coveralls/php-coveralls": "^2.1",
                 "php-cs-fixer/accessible-object": "^1.0",
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-                "phpunitgoodpractices/traits": "^1.3.1",
-                "symfony/phpunit-bridge": "^3.2.2 || ^4.0"
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
+                "phpunitgoodpractices/traits": "^1.5",
+                "symfony/phpunit-bridge": "^4.0"
             },
             "suggest": {
                 "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
                 "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
             },
             "bin": [
@@ -4556,7 +4732,6 @@
                     "tests/Test/AbstractIntegrationCaseFactory.php",
                     "tests/Test/AbstractIntegrationTestCase.php",
                     "tests/Test/Assert/AssertTokensTrait.php",
-                    "tests/Test/Constraint/SameStringsConstraint.php",
                     "tests/Test/IntegrationCase.php",
                     "tests/Test/IntegrationCaseFactory.php",
                     "tests/Test/IntegrationCaseFactoryInterface.php",
@@ -4579,20 +4754,20 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2018-03-20T18:07:08+00:00"
+            "time": "2018-06-10T08:26:56+00:00"
         },
         {
             "name": "lusitanian/oauth",
-            "version": "v0.8.10",
+            "version": "v0.8.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Lusitanian/PHPoAuthLib.git",
-                "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed"
+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/09f4af38f17db6938253f4d1b171d537913ac1ed",
-                "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed",
+                "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/fc11a53db4b66da555a6a11fce294f574a8374f9",
+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9",
                 "shasum": ""
             },
             "require": {
@@ -4646,29 +4821,32 @@
                 "oauth",
                 "security"
             ],
-            "time": "2016-07-12T22:15:40+00:00"
+            "time": "2018-02-14T22:37:14+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.7.0",
+            "version": "1.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.1"
+            },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
             },
             "require-dev": {
                 "doctrine/collections": "^1.0",
                 "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^4.1"
+                "phpunit/phpunit": "^7.1"
             },
             "type": "library",
             "autoload": {
@@ -4691,7 +4869,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2017-10-19T19:58:43+00:00"
+            "time": "2018-06-11T23:09:50+00:00"
         },
         {
             "name": "pdepend/pdepend",
@@ -5106,23 +5284,23 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.7.5",
+            "version": "1.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
-                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
                 "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
                 "sebastian/recursion-context": "^1.0|^2.0|^3.0"
             },
             "require-dev": {
@@ -5165,7 +5343,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2018-02-19T10:16:54+00:00"
+            "time": "2018-04-18T13:57:24+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -5418,16 +5596,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "6.2.4",
+            "version": "6.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9"
+                "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ff3a76a58ac293657808aefd58c8aaf05945f4d9",
-                "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
+                "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
                 "shasum": ""
             },
             "require": {
@@ -5436,24 +5614,24 @@
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
-                "myclabs/deep-copy": "^1.3",
+                "myclabs/deep-copy": "^1.6.1",
                 "phar-io/manifest": "^1.0.1",
                 "phar-io/version": "^1.0",
                 "php": "^7.0",
                 "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^5.2",
-                "phpunit/php-file-iterator": "^1.4",
-                "phpunit/php-text-template": "^1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "^4.0",
-                "sebastian/comparator": "^2.0",
-                "sebastian/diff": "^1.4.3",
-                "sebastian/environment": "^3.0.2",
+                "phpunit/php-code-coverage": "^5.3",
+                "phpunit/php-file-iterator": "^1.4.3",
+                "phpunit/php-text-template": "^1.2.1",
+                "phpunit/php-timer": "^1.0.9",
+                "phpunit/phpunit-mock-objects": "^5.0.5",
+                "sebastian/comparator": "^2.1",
+                "sebastian/diff": "^2.0",
+                "sebastian/environment": "^3.1",
                 "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^1.1 || ^2.0",
-                "sebastian/object-enumerator": "^3.0.2",
+                "sebastian/global-state": "^2.0",
+                "sebastian/object-enumerator": "^3.0.3",
                 "sebastian/resource-operations": "^1.0",
-                "sebastian/version": "^2.0"
+                "sebastian/version": "^2.0.1"
             },
             "conflict": {
                 "phpdocumentor/reflection-docblock": "3.0.2",
@@ -5472,7 +5650,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.2.x-dev"
+                    "dev-master": "6.5.x-dev"
                 }
             },
             "autoload": {
@@ -5498,33 +5676,33 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-08-03T13:59:28+00:00"
+            "time": "2018-04-10T11:38:34+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "4.0.4",
+            "version": "5.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0"
+                "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0",
-                "reference": "2f789b59ab89669015ad984afa350c4ec577ade0",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3eaf040f20154d27d6da59ca2c6e28ac8fd56dce",
+                "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.5",
                 "php": "^7.0",
                 "phpunit/php-text-template": "^1.2.1",
-                "sebastian/exporter": "^3.0"
+                "sebastian/exporter": "^3.1"
             },
             "conflict": {
                 "phpunit/phpunit": "<6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^6.5"
             },
             "suggest": {
                 "ext-soap": "*"
@@ -5532,7 +5710,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0.x-dev"
+                    "dev-master": "5.0.x-dev"
                 }
             },
             "autoload": {
@@ -5547,7 +5725,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -5557,7 +5735,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2017-08-03T14:08:16+00:00"
+            "time": "2018-05-29T13:50:43+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -5606,30 +5784,30 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "2.0.0",
+            "version": "2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "20f84f468cb67efee293246e6a09619b891f55f0"
+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/20f84f468cb67efee293246e6a09619b891f55f0",
-                "reference": "20f84f468cb67efee293246e6a09619b891f55f0",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0",
-                "sebastian/diff": "^1.2",
-                "sebastian/exporter": "^3.0"
+                "sebastian/diff": "^2.0 || ^3.0",
+                "sebastian/exporter": "^3.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^6.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "2.1.x-dev"
                 }
             },
             "autoload": {
@@ -5660,38 +5838,38 @@
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
             "keywords": [
                 "comparator",
                 "compare",
                 "equality"
             ],
-            "time": "2017-03-03T06:26:08+00:00"
+            "time": "2018-02-01T13:46:46+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "1.4.3",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
+                "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": "^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+                "phpunit/phpunit": "^6.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -5718,7 +5896,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2017-05-22T07:24:03+00:00"
+            "time": "2017-08-03T08:09:46+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -6209,16 +6387,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.2.2",
+            "version": "3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1"
+                "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7c00c3000ac0ce79c96fcbfef86b49a71158cd1",
-                "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266",
+                "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266",
                 "shasum": ""
             },
             "require": {
@@ -6228,7 +6406,7 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
             },
             "bin": [
                 "bin/phpcs",
@@ -6256,25 +6434,26 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2017-12-19T21:44:46+00:00"
+            "time": "2018-06-06T23:58:19+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "7c19370ab04e9ac05b74a504198e165f5ccf6dd8"
+                "reference": "e57e7b573df9d0eaa8c0152768c708ee7ea2b8e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/7c19370ab04e9ac05b74a504198e165f5ccf6dd8",
-                "reference": "7c19370ab04e9ac05b74a504198e165f5ccf6dd8",
+                "url": "https://api.github.com/repos/symfony/config/zipball/e57e7b573df9d0eaa8c0152768c708ee7ea2b8e5",
+                "reference": "e57e7b573df9d0eaa8c0152768c708ee7ea2b8e5",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1.3",
-                "symfony/filesystem": "~3.4|~4.0"
+                "symfony/filesystem": "~3.4|~4.0",
+                "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
                 "symfony/finder": "<3.4"
@@ -6291,7 +6470,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -6318,20 +6497,20 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2018-03-19T22:35:49+00:00"
+            "time": "2018-06-20T11:15:17+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "9f1cea656afc5512c6f5e58d61fcea12acee113e"
+                "reference": "e761828a85d7dfc00b927f94ccbe1851ce0b6535"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9f1cea656afc5512c6f5e58d61fcea12acee113e",
-                "reference": "9f1cea656afc5512c6f5e58d61fcea12acee113e",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e761828a85d7dfc00b927f94ccbe1851ce0b6535",
+                "reference": "e761828a85d7dfc00b927f94ccbe1851ce0b6535",
                 "shasum": ""
             },
             "require": {
@@ -6339,7 +6518,7 @@
                 "psr/container": "^1.0"
             },
             "conflict": {
-                "symfony/config": "<3.4",
+                "symfony/config": "<4.1.1",
                 "symfony/finder": "<3.4",
                 "symfony/proxy-manager-bridge": "<3.4",
                 "symfony/yaml": "<3.4"
@@ -6348,7 +6527,7 @@
                 "psr/container-implementation": "1.0"
             },
             "require-dev": {
-                "symfony/config": "~3.4|~4.0",
+                "symfony/config": "~4.1",
                 "symfony/expression-language": "~3.4|~4.0",
                 "symfony/yaml": "~3.4|~4.0"
             },
@@ -6362,7 +6541,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -6389,20 +6568,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2018-04-02T09:52:41+00:00"
+            "time": "2018-06-25T11:12:43+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0"
+                "reference": "45cdcc8a96ef92b43a50723e6d1f5f83096e8cef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/371532a2cfe932f7a3766dd4c45364566def1dd0",
-                "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/45cdcc8a96ef92b43a50723e6d1f5f83096e8cef",
+                "reference": "45cdcc8a96ef92b43a50723e6d1f5f83096e8cef",
                 "shasum": ""
             },
             "require": {
@@ -6411,7 +6590,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -6443,20 +6622,20 @@
                 "configuration",
                 "options"
             ],
-            "time": "2018-01-18T22:19:33+00:00"
+            "time": "2018-05-31T10:17:53+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.7.0",
+            "version": "v1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f"
+                "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f",
-                "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6",
+                "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6",
                 "shasum": ""
             },
             "require": {
@@ -6466,7 +6645,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "1.8-dev"
                 }
             },
             "autoload": {
@@ -6502,20 +6681,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-01-30T19:27:44+00:00"
+            "time": "2018-04-26T10:06:28+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.7.0",
+            "version": "v1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "8eca20c8a369e069d4f4c2ac9895144112867422"
+                "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422",
-                "reference": "8eca20c8a369e069d4f4c2ac9895144112867422",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/a4576e282d782ad82397f3e4ec1df8e0f0cafb46",
+                "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46",
                 "shasum": ""
             },
             "require": {
@@ -6524,7 +6703,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "1.8-dev"
                 }
             },
             "autoload": {
@@ -6557,20 +6736,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-01-31T17:43:24+00:00"
+            "time": "2018-04-26T10:06:28+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v4.0.8",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "6795ffa2f8eebedac77f045aa62c0c10b2763042"
+                "reference": "07463bbbbbfe119045a24c4a516f92ebd2752784"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6795ffa2f8eebedac77f045aa62c0c10b2763042",
-                "reference": "6795ffa2f8eebedac77f045aa62c0c10b2763042",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/07463bbbbbfe119045a24c4a516f92ebd2752784",
+                "reference": "07463bbbbbfe119045a24c4a516f92ebd2752784",
                 "shasum": ""
             },
             "require": {
@@ -6579,7 +6758,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -6606,7 +6785,7 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2018-02-19T16:50:22+00:00"
+            "time": "2018-02-19T16:51:42+00:00"
         },
         {
             "name": "theseer/fdomdocument",
@@ -6742,6 +6921,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
+        "magento/composer": 20,
         "phpmd/phpmd": 0
     },
     "prefer-stable": true,

From ac05dea09ea06625d49c3064c832e86fef47750a Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Fri, 29 Jun 2018 08:17:39 +0300
Subject: [PATCH 074/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Magento/Framework/Code/GeneratorTest.php        |  1 -
 .../Framework/Code/Generator/EntityAbstract.php     | 13 +++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
index ae1edf421713c..9179e3ae8ff90 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Code;
 
-use Magento\Framework\Code\Generator;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Interception\Code\Generator as InterceptionGenerator;
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index 7225ef024387e..b80828b299d76 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -108,12 +108,13 @@ public function generate()
                 }
             }
         } catch (FileSystemException $e) {
-            $message = <<<'EOT'
-Error: an object of a generated class may be a dependency for another object, but this dependency has not been defined or set correctly in the signature of the related construct method.
-Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento deploy:mode:set production` does not create the required generated classes.
-Magento cannot write a class file to the "generated" directory that is read-only. Before using the read-only file system, the classes to be generated must be created beforehand in the "generated" directory.
-For details, see the "File systems access permissions" topic at http://devdocs.magento.com.
-EOT;
+            $message = 'Error: an object of a generated class may be a dependency for another object, but this '
+                . 'dependency has not been defined or set correctly in the signature of the related construct method.'
+                . 'Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento '
+                . 'deploy:mode:set production` does not create the required generated classes.'
+                . 'Magento cannot write a class file to the "generated" directory that is read-only. Before using the '
+                . 'read-only file system, the classes to be generated must be created beforehand in the "generated" directory.'
+                . 'For details, see the "File systems access permissions" topic at http://devdocs.magento.com.';
             $this->_addError($message);
             $this->_addError($e->getMessage());
         } catch (\Exception $e) {

From 0fa5a0aacf5cd6db0dbebb62e1c47ba7819555e2 Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Fri, 29 Jun 2018 08:48:46 +0300
Subject: [PATCH 075/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Magento/Framework/Code/GeneratorTest.php  |  8 ++++----
 .../Magento/Framework/Code/Generator.php      |  2 +-
 .../Code/Generator/EntityAbstract.php         |  6 +++---
 .../Unit/Generator/EntityAbstractTest.php     | 19 +++++++++++--------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
index 9179e3ae8ff90..73c7f3f698181 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
@@ -196,10 +196,10 @@ public function testGeneratorClassWithErrorSaveClassFile()
     {
         $exceptionMessageRegExp = '/Error: an object of a generated class may be a dependency for another object, '
             . 'but this dependency has not been defined or set correctly in the signature of the related construct '
-            . 'method\.\nDue to the current error, executing the CLI commands `bin\/magento setup:di:compile` '
-            . 'or `bin\/magento deploy:mode:set production` does not create the required generated classes\.\nMagento '
-            . 'cannot write a class file to the "generated" directory that is read\-only\. Before using the read-only '
-            . 'file system, the classes to be generated must be created beforehand in the "generated" directory\.\n'
+            . 'method\. Due to the current error, executing the CLI commands `bin\/magento setup:di:compile` '
+            . 'or `bin\/magento deploy:mode:set production` does not create the required generated classes\. Magento '
+            . 'cannot write a class file to the "generated" directory that is read-only\. Before using the read-only '
+            . 'file system, the classes to be generated must be created beforehand in the "generated" directory\. '
             . 'For details, see the "File systems access permissions" topic at http:\/\/devdocs\.magento\.com\.\n'
             . 'The specified ".*" file couldn\'t be written.  in \[.*\]/';
 
diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index 46299ebee9813..1a53ca8814d10 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -113,7 +113,7 @@ public function generateClass($className)
             $this->tryToLoadSourceClass($className, $generator);
             if (!($file = $generator->generate())) {
                 /** @var $logger LoggerInterface */
-                $logger = $this->objectManager->get(LoggerInterface::class);
+                $logger = $this->getObjectManager()->get(LoggerInterface::class);
                 $errors = $generator->getErrors();
                 $message = implode(PHP_EOL, $errors) . ' in [' . $className . ']';
                 $logger->critical($message);
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index b80828b299d76..c78b7a8ecf668 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -109,11 +109,11 @@ public function generate()
             }
         } catch (FileSystemException $e) {
             $message = 'Error: an object of a generated class may be a dependency for another object, but this '
-                . 'dependency has not been defined or set correctly in the signature of the related construct method.'
+                . 'dependency has not been defined or set correctly in the signature of the related construct method. '
                 . 'Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento '
-                . 'deploy:mode:set production` does not create the required generated classes.'
+                . 'deploy:mode:set production` does not create the required generated classes. '
                 . 'Magento cannot write a class file to the "generated" directory that is read-only. Before using the '
-                . 'read-only file system, the classes to be generated must be created beforehand in the "generated" directory.'
+                . 'read-only file system, the classes to be generated must be created beforehand in the "generated" directory. '
                 . 'For details, see the "File systems access permissions" topic at http://devdocs.magento.com.';
             $this->_addError($message);
             $this->_addError($e->getMessage());
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
index 6e9b84db0e984..a32e0c62c7d2e 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
@@ -215,14 +215,16 @@ public function testGenerate(
     /**
      * @inheritdoc
      */
-    public function testGenerateFailure() {
-
-        $infoMessage = <<<'EOT'
-Error: an object of a generated class may be a dependency for another object, but this dependency has not been defined or set correctly in the signature of the related construct method.
-Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento deploy:mode:set production` does not create the required generated classes.
-Magento cannot write a class file to the "generated" directory that is read-only. Before using the read-only file system, the classes to be generated must be created beforehand in the "generated" directory.
-For details, see the "File systems access permissions" topic at http://devdocs.magento.com.
-EOT;
+    public function testGenerateFailure()
+    {
+        $infoMessage = 'Error: an object of a generated class may be a dependency for another object, but this '
+            . 'dependency has not been defined or set correctly in the signature of the related construct method. '
+            . 'Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento '
+            . 'deploy:mode:set production` does not create the required generated classes. '
+            . 'Magento cannot write a class file to the "generated" directory that is read-only. Before using the '
+            . 'read-only file system, the classes to be generated must be created beforehand in the "generated" directory. '
+            . 'For details, see the "File systems access permissions" topic at http://devdocs.magento.com.';
+
         $exceptionMessage = 'Some description';
 
         $abstractGetters = ['_getClassProperties', '_getClassMethods'];
@@ -254,6 +256,7 @@ public function testGenerateFailure() {
         $this->assertFalse($result);
         $this->assertEquals([$infoMessage, $exceptionMessage], $this->_model->getErrors());
     }
+
     /**
      * Prepares mocks for validation verification
      *

From 79053d7040de5f602941d5d1ec278b431a2de332 Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Fri, 29 Jun 2018 08:57:54 +0300
Subject: [PATCH 076/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../testsuite/Magento/Framework/Code/GeneratorTest.php           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
index 73c7f3f698181..c9f2afc6f44f1 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
@@ -18,6 +18,7 @@
 
 /**
  * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GeneratorTest extends \PHPUnit\Framework\TestCase
 {

From 5aa52974638c07bff6b388b97cf05d8a74b885ad Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Fri, 29 Jun 2018 09:43:12 +0300
Subject: [PATCH 077/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Code/Generator/EntityAbstract.php         | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index c78b7a8ecf668..170779697ac03 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -110,11 +110,12 @@ public function generate()
         } catch (FileSystemException $e) {
             $message = 'Error: an object of a generated class may be a dependency for another object, but this '
                 . 'dependency has not been defined or set correctly in the signature of the related construct method. '
-                . 'Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento '
-                . 'deploy:mode:set production` does not create the required generated classes. '
+                . 'Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento'
+                . ' deploy:mode:set production` does not create the required generated classes. '
                 . 'Magento cannot write a class file to the "generated" directory that is read-only. Before using the '
-                . 'read-only file system, the classes to be generated must be created beforehand in the "generated" directory. '
-                . 'For details, see the "File systems access permissions" topic at http://devdocs.magento.com.';
+                . 'read-only file system, the classes to be generated must be created beforehand in the "generated" '
+                . 'directory. For details, see the "File systems access permissions" topic '
+                . 'at http://devdocs.magento.com.';
             $this->_addError($message);
             $this->_addError($e->getMessage());
         } catch (\Exception $e) {
@@ -261,9 +262,9 @@ protected function _validateData()
             $this->_addError('Source class ' . $sourceClassName . ' doesn\'t exist.');
             return false;
         } elseif (/**
-             * If makeResultFileDirectory only fails because the file is already created,
-             * a competing process has generated the file, no exception should be thrown.
-             */
+         * If makeResultFileDirectory only fails because the file is already created,
+         * a competing process has generated the file, no exception should be thrown.
+         */
             !$this->_ioObject->makeResultFileDirectory($resultClassName)
             && !$this->_ioObject->fileExists($resultDir)
         ) {
@@ -322,7 +323,8 @@ protected function _getNullDefaultValue()
      */
     private function extractParameterType(
         \ReflectionParameter $parameter
-    ): ?string {
+    ): ?string
+    {
         /** @var string|null $typeName */
         $typeName = null;
         if ($parameter->hasType()) {
@@ -339,7 +341,7 @@ private function extractParameterType(
             }
 
             if ($parameter->allowsNull()) {
-                $typeName = '?' .$typeName;
+                $typeName = '?' . $typeName;
             }
         }
 
@@ -353,7 +355,8 @@ private function extractParameterType(
      */
     private function extractParameterDefaultValue(
         \ReflectionParameter $parameter
-    ): ?ValueGenerator {
+    ): ?ValueGenerator
+    {
         /** @var ValueGenerator|null $value */
         $value = null;
         if ($parameter->isOptional() && $parameter->isDefaultValueAvailable()) {

From a0fa7446860ce8fa46e30f5d5fc19fd25f3dcb21 Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Fri, 29 Jun 2018 10:35:29 +0300
Subject: [PATCH 078/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Magento/Framework/Code/Generator/EntityAbstract.php       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index 170779697ac03..0a8ad17ade93d 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -321,9 +321,7 @@ protected function _getNullDefaultValue()
      *
      * @return null|string
      */
-    private function extractParameterType(
-        \ReflectionParameter $parameter
-    ): ?string
+    private function extractParameterType(\ReflectionParameter $parameter): ?string
     {
         /** @var string|null $typeName */
         $typeName = null;

From e2680fffaa33143ac23dbba9623c373016d1270d Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Fri, 29 Jun 2018 10:51:25 +0300
Subject: [PATCH 079/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Magento/Framework/Code/Generator/EntityAbstract.php       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index 0a8ad17ade93d..0a2dcd6e6c2df 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -351,9 +351,7 @@ private function extractParameterType(\ReflectionParameter $parameter): ?string
      *
      * @return null|ValueGenerator
      */
-    private function extractParameterDefaultValue(
-        \ReflectionParameter $parameter
-    ): ?ValueGenerator
+    private function extractParameterDefaultValue(\ReflectionParameter $parameter): ?ValueGenerator
     {
         /** @var ValueGenerator|null $value */
         $value = null;

From 75fb28c2ab25740977fc5f15fed33b80faaa25c3 Mon Sep 17 00:00:00 2001
From: Andreas Schrammel <schrammel@e-conomix.at>
Date: Fri, 29 Jun 2018 09:54:50 +0200
Subject: [PATCH 080/127] :bug: Add missing showInStore attributes

Add missing showInStore attributes on Braintree configuration as there
are some values that are changeable on store view (Title, Descriptors,
merchant name override) and are not accessible from store view level.
---
 app/code/Magento/Braintree/etc/adminhtml/system.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml
index f46da366b64a3..c49402070f0fd 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/system.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml
@@ -44,7 +44,7 @@
                         <comment>http://docs.magento.com/m2/ce/user_guide/payment/braintree.html</comment>
                         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
                     </group>
-                    <group id="braintree_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="5">
+                    <group id="braintree_required" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="5">
                         <label>Basic Braintree Settings</label>
                         <attribute type="expanded">1</attribute>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
@@ -77,7 +77,7 @@
                             <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         </field>
                     </group>
-                    <group id="braintree_advanced" translate="label" showInDefault="1" showInWebsite="1" sortOrder="20">
+                    <group id="braintree_advanced" translate="label" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="20">
                         <label>Advanced Braintree Settings</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
                         <field id="braintree_cc_vault_title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -125,7 +125,7 @@
                             <config_path>payment/braintree/sort_order</config_path>
                         </field>
                     </group>
-                    <group id="braintree_country_specific" translate="label" showInDefault="1" showInWebsite="1" sortOrder="30">
+                    <group id="braintree_country_specific" translate="label" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="30">
                         <label>Country Specific Settings</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
                         <field id="allowspecific" translate="label" type="allowspecific" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -146,7 +146,7 @@
                             <config_path>payment/braintree/countrycreditcard</config_path>
                         </field>
                     </group>
-                    <group id="braintree_paypal" translate="label" showInDefault="1" showInWebsite="1" sortOrder="40">
+                    <group id="braintree_paypal" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
                         <label>PayPal through Braintree</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
                         <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -215,7 +215,7 @@
                             <config_path>payment/braintree_paypal/skip_order_review</config_path>
                         </field>
                     </group>
-                    <group id="braintree_3dsecure" translate="label" showInDefault="1" showInWebsite="1" sortOrder="41">
+                    <group id="braintree_3dsecure" translate="label" showInDefault="1" showInWebsite="1" showInStore="0" sortOrder="41">
                         <label>3D Secure Verification Settings</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
                         <field id="verify_3dsecure" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -239,7 +239,7 @@
                             <config_path>payment/braintree/verify_specific_countries</config_path>
                         </field>
                     </group>
-                    <group id="braintree_dynamic_descriptor" translate="label" showInDefault="1" showInWebsite="1" sortOrder="50">
+                    <group id="braintree_dynamic_descriptor" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
                         <label>Dynamic Descriptors</label>
                         <comment><![CDATA[Dynamic descriptors are sent on a per-transaction basis and define what will appear on your customers credit card statements for a specific purchase.
                             The clearer the description of your product, the less likely customers will issue chargebacks due to confusion or non-recognition.

From c455c1e641f44a79d365fb57766051805aa1df49 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Fri, 29 Jun 2018 11:01:45 +0300
Subject: [PATCH 081/127] MAGETWO-88645: Error while deleting a Product Image

---
 .../Product/Gallery/UpdateHandlerTest.php     | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
new file mode 100644
index 0000000000000..703e83c70c267
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Gallery;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Filesystem;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+/**
+ * Test for \Magento\Catalog\Model\Product\Gallery\UpdateHandler.
+ *
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ */
+class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var UpdateHandler
+     */
+    private $updateHandler;
+
+    /**
+     * @var WriteInterface
+     */
+    private $rootDirectory;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var string
+     */
+    private $fileName;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->fileName = 'test.txt';
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->updateHandler = $this->objectManager->create(UpdateHandler::class);
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+        $this->rootDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::ROOT);
+
+        $filePath = $this->rootDirectory->getAbsolutePath($this->fileName);
+        $file = fopen($filePath, "wb");
+        fwrite($file, 'Test');
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithIllegalFilename(): void
+    {
+        $filePath = str_repeat('/..', 9) . '/' . $this->fileName;
+
+        /** @var $product Product */
+        $product = Bootstrap::getObjectManager()->create(Product::class);
+        $product->load(1);
+        $product->setData(
+            'media_gallery',
+            [
+                'images' => [
+                    'image' => [
+                        'value_id' => '100',
+                        'file' => $filePath,
+                        'label' => 'New image',
+                        'removed' => 1,
+                    ],
+                ],
+            ]
+        );
+
+        $this->updateHandler->execute($product);
+        $this->assertFileExists($this->rootDirectory->getAbsolutePath($this->fileName));
+    }
+
+    /**
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        unlink($this->rootDirectory->getAbsolutePath($this->fileName));
+    }
+}

From 0083bd399f34b90e6a4fa549d246f0a0ad3ff183 Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Fri, 29 Jun 2018 11:15:55 +0300
Subject: [PATCH 082/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Framework/Code/Test/Unit/Generator/EntityAbstractTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
index a32e0c62c7d2e..62470a6aafb39 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
@@ -222,8 +222,8 @@ public function testGenerateFailure()
             . 'Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento '
             . 'deploy:mode:set production` does not create the required generated classes. '
             . 'Magento cannot write a class file to the "generated" directory that is read-only. Before using the '
-            . 'read-only file system, the classes to be generated must be created beforehand in the "generated" directory. '
-            . 'For details, see the "File systems access permissions" topic at http://devdocs.magento.com.';
+            . 'read-only file system, the classes to be generated must be created beforehand in the "generated" '
+            . 'directory. For details, see the "File systems access permissions" topic at http://devdocs.magento.com.';
 
         $exceptionMessage = 'Some description';
 

From 3b814c5e6d8ca44f4e87d5f27c38e70e6f170377 Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Fri, 29 Jun 2018 17:46:08 +0300
Subject: [PATCH 083/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Magento/Framework/Code/GeneratorTest.php  | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
index c9f2afc6f44f1..b103d72785632 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
@@ -44,6 +44,14 @@ class GeneratorTest extends \PHPUnit\Framework\TestCase
      */
     protected $logDirectory;
 
+    /**
+     * @var int
+     */
+    protected $oldPermissionGenerationDir;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -51,7 +59,6 @@ protected function setUp()
         $filesystem = $objectManager->get(\Magento\Framework\Filesystem::class);
         $this->generatedDirectory = $filesystem->getDirectoryWrite(DirectoryList::GENERATED_CODE);
         $this->logDirectory = $filesystem->getDirectoryRead(DirectoryList::LOG);
-        $this->generatedDirectory->create();
         $generatedDirectory = $this->generatedDirectory->getAbsolutePath();
         $this->_ioObject = new \Magento\Framework\Code\Generator\Io(
             new \Magento\Framework\Filesystem\Driver\File(),
@@ -72,6 +79,10 @@ protected function setUp()
             ]
         );
         $this->_generator->setObjectManager($objectManager);
+
+        if (file_exists($generatedDirectory)) {
+            $this->oldPermissionGenerationDir = fileperms($generatedDirectory);
+        }
     }
 
     protected function tearDown()
@@ -79,6 +90,14 @@ protected function tearDown()
         $this->generatedDirectory->changePermissionsRecursively('./', 0777, 0666);
         $this->generatedDirectory->delete();
         $this->_generator = null;
+
+        if ($this->oldPermissionGenerationDir) {
+            mkdir(
+                $this->generatedDirectory->getAbsolutePath(),
+                $this->oldPermissionGenerationDir,
+                true
+            );
+        }
     }
 
     protected function _clearDocBlock($classBody)
@@ -195,23 +214,20 @@ public function testGenerateClassExtensionAttributesInterfaceFactoryWithNamespac
 
     public function testGeneratorClassWithErrorSaveClassFile()
     {
-        $exceptionMessageRegExp = '/Error: an object of a generated class may be a dependency for another object, '
+        $msgPart = 'Error: an object of a generated class may be a dependency for another object, '
             . 'but this dependency has not been defined or set correctly in the signature of the related construct '
-            . 'method\. Due to the current error, executing the CLI commands `bin\/magento setup:di:compile` '
-            . 'or `bin\/magento deploy:mode:set production` does not create the required generated classes\. Magento '
-            . 'cannot write a class file to the "generated" directory that is read-only\. Before using the read-only '
-            . 'file system, the classes to be generated must be created beforehand in the "generated" directory\. '
-            . 'For details, see the "File systems access permissions" topic at http:\/\/devdocs\.magento\.com\.\n'
-            . 'The specified ".*" file couldn\'t be written.  in \[.*\]/';
+            . 'method';
 
         $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessageRegExp($exceptionMessageRegExp);
+        $this->expectExceptionMessageRegExp("/^$msgPart.*/");
         $this->generatedDirectory->changePermissionsRecursively('./', 0555, 0444);
         $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'ExtensionInterfaceFactory';
 
         $generatorResult = $this->_generator->generateClass($factoryClassName);
         $this->assertFalse($generatorResult);
-        $pathToSystemLog =  $this->logDirectory->getAbsolutePath('system.log');
-        $this->assertRegexp($exceptionMessageRegExp, file_get_contents($pathToSystemLog));
+
+        $pathToSystemLog = $this->logDirectory->getAbsolutePath('system.log');
+        $logs = array_slice(file($pathToSystemLog), -2);
+        $this->assertContains($msgPart, $logs[0]);
     }
 }

From a005d07af624a2272ae6792817ec991182e7f888 Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Fri, 29 Jun 2018 18:00:05 +0300
Subject: [PATCH 084/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../testsuite/Magento/Framework/Code/GeneratorTest.php        | 4 ++--
 generated/.htaccess                                           | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 generated/.htaccess

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
index b103d72785632..42a8c0618bfdb 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
@@ -42,12 +42,12 @@ class GeneratorTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Framework\Filesystem\Directory\Read
      */
-    protected $logDirectory;
+    private $logDirectory;
 
     /**
      * @var int
      */
-    protected $oldPermissionGenerationDir;
+    private $oldPermissionGenerationDir;
 
     /**
      * @inheritdoc
diff --git a/generated/.htaccess b/generated/.htaccess
old mode 100755
new mode 100644

From c686b4deda12d8fab6393c2127b7e0cd6cf5ac62 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Fri, 29 Jun 2018 12:00:09 -0500
Subject: [PATCH 085/127] MC-2338: 3rd party library/dependency upgrade for 2.3
 pre Alpha

---
 .../Magento/Test/Event/TransactionTest.php    | 10 +--
 .../Unit/Matcher/MethodInvokedAtIndexTest.php |  4 +-
 .../Unit/Matcher/MethodInvokedAtIndex.php     | 70 ++++++++++++++++---
 3 files changed, 69 insertions(+), 15 deletions(-)

diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php
index 5bb273b4e2781..feb1c0bf61c16 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php
@@ -30,7 +30,7 @@ protected function setUp()
     {
         $this->_eventManager = $this->getMockBuilder(\Magento\TestFramework\EventManager::class)
             ->setMethods(['fireEvent'])
-            ->setConstructorArgs([[]])
+            ->disableOriginalConstructor()
             ->getMock();
 
         $this->_adapter =
@@ -69,9 +69,9 @@ protected function _imitateTransactionStartRequest($eventName)
     /**
      * Setup expectations for "transaction start" use case
      *
-     * @param \PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher
+     * @param \PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher
      */
-    protected function _expectTransactionStart(\PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher)
+    protected function _expectTransactionStart(\PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher)
     {
         $this->_eventManager->expects($invocationMatcher)->method('fireEvent')->with('startTransaction');
         $this->_adapter->expects($this->once())->method('beginTransaction');
@@ -103,9 +103,9 @@ protected function _imitateTransactionRollbackRequest($eventName)
     /**
      * Setup expectations for "transaction rollback" use case
      *
-     * @param \PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher
+     * @param \PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher
      */
-    protected function _expectTransactionRollback(\PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher)
+    protected function _expectTransactionRollback(\PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher)
     {
         $this->_eventManager->expects($invocationMatcher)->method('fireEvent')->with('rollbackTransaction');
         $this->_adapter->expects($this->once())->method('rollback');
diff --git a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php b/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php
index 9721cdb8f9331..a232934e1c785 100644
--- a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php
+++ b/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php
@@ -11,14 +11,14 @@ class MethodInvokedAtIndexTest extends \PHPUnit\Framework\TestCase
 {
     public function testMatches()
     {
-        $invocationObject = new \PHPUnit_Framework_MockObject_Invocation_Object(
+        $invocationObject = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation(
             'ClassName',
             'ValidMethodName',
             [],
             'void',
             new \StdClass()
         );
-        $matcher = new \Magento\Framework\TestFramework\Unit\Matcher\MethodInvokedAtIndex(0);
+        $matcher = new MethodInvokedAtIndex(0);
         $this->assertTrue($matcher->matches($invocationObject));
 
         $matcher = new MethodInvokedAtIndex(1);
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
index cd116521dbea5..5d1d48cee7ee6 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Framework\TestFramework\Unit\Matcher;
 
+use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\MockObject\Invocation as BaseInvocation;
+
 /**
  * Class MethodInvokedAtIndex
  * Matches invocations per 'method' at 'position'
@@ -18,30 +21,81 @@
  *
  * @package Magento\TestFramework\Matcher
  */
-class MethodInvokedAtIndex extends \PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex
+class MethodInvokedAtIndex implements \PHPUnit\Framework\MockObject\Matcher\Invocation
 {
+    /**
+     * @var int
+     */
+    private $sequenceIndex;
+
+    /**
+     * @var int
+     */
+    private $currentIndex = -1;
+
     /**
      * @var array
      */
-    protected $indexes = [];
+    private $indexes = [];
+
+    /**
+     * @param int $sequenceIndex
+     */
+    public function __construct($sequenceIndex)
+    {
+        $this->sequenceIndex = $sequenceIndex;
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        return 'invoked at sequence index ' . $this->sequenceIndex;
+    }
 
     /**
-     * @param  \PHPUnit_Framework_MockObject_Invocation $invocation
+     * @param  \PHPUnit\Framework\MockObject\Invocation $invocation
      * @return boolean
      */
-    public function matches(\PHPUnit_Framework_MockObject_Invocation $invocation)
+    public function matches(BaseInvocation $invocation)
     {
         /** @noinspection PhpUndefinedFieldInspection */
-        if (!isset($this->indexes[$invocation->methodName])) {
+        if (!isset($this->indexes[$invocation->getMethodName()])) {
             /** @noinspection PhpUndefinedFieldInspection */
-            $this->indexes[$invocation->methodName] = 0;
+            $this->indexes[$invocation->getMethodName()] = 0;
         } else {
             /** @noinspection PhpUndefinedFieldInspection */
-            $this->indexes[$invocation->methodName]++;
+            $this->indexes[$invocation->getMethodName()]++;
         }
         $this->currentIndex++;
 
         /** @noinspection PhpUndefinedFieldInspection */
-        return $this->indexes[$invocation->methodName] == $this->sequenceIndex;
+        return $this->indexes[$invocation->getMethodName()] == $this->sequenceIndex;
+    }
+
+    /**
+     * @param BaseInvocation $invocation
+     */
+    public function invoked(BaseInvocation $invocation)
+    {
+    }
+
+    /**
+     * Verifies that the current expectation is valid. If everything is OK the
+     * code should just return, if not it must throw an exception.
+     *
+     * @throws ExpectationFailedException
+     */
+    public function verify()
+    {
+        if ($this->currentIndex < $this->sequenceIndex) {
+            throw new ExpectationFailedException(
+                \sprintf(
+                    'The expected invocation at index %s was never reached.',
+                    $this->sequenceIndex
+                )
+            );
+        }
     }
 }

From 6e88fd90fbf7444b49daf4b6a7c706331fb37eb9 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Fri, 29 Jun 2018 13:45:34 -0500
Subject: [PATCH 086/127] MC-2338: 3rd party library/dependency upgrade for 2.3
 pre Alpha

---
 .../view/frontend/templates/checkout/billing.phtml          | 2 +-
 .../view/frontend/templates/checkout/results.phtml          | 2 +-
 .../view/frontend/templates/checkout/success.phtml          | 6 +++---
 .../templates/order/create/billing/method/form.phtml        | 2 +-
 .../testsuite/Magento/SalesRule/_files/coupons_advanced.php | 2 +-
 .../Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
index d8514ca77f9c2..da553b7823da9 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -79,7 +79,7 @@
                                 if (isset($methodsForms[$code])) {
                                     $block->setMethodFormTemplate($code, $methodsForms[$code]);
                                 }
-                            ?>
+                                ?>
                             <dt class="item-title">
                                 <?php if ($methodsCount > 1) : ?>
                                     <input type="radio"
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml
index dacf96f9c0baf..68ff49b7b0dbb 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/results.phtml
@@ -11,7 +11,7 @@ $orderIds = $block->getOrderIds();
 <div class="multicheckout results">
     <p class="block-content">
         <?php if (!empty($orderIds)) : ?>
-        <?= $block->escapeHtml(__('Not all items were included.')); ?>
+            <?= $block->escapeHtml(__('Not all items were included.')); ?>
         <?php endif; ?>
         <?= $block->escapeHtml(__('For details, see')); ?>
         <a href="#failed"><?= $block->escapeHtml(__('Failed to Order')); ?></a>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
index 57c4afaee6541..0fe046800a80d 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
@@ -24,9 +24,9 @@
                         <?php if ($shippingAddress) : ?>
                         <span class="shipping-label"><?= $block->escapeHtml(__('Ship to:')); ?></span>
                         <span class="shipping-address">
-                        <?= $block->escapeHtml(
-                            $block->getCheckoutData()->formatOrderShippingAddress($shippingAddress)
-                        ); ?>
+                            <?= $block->escapeHtml(
+                                $block->getCheckoutData()->formatOrderShippingAddress($shippingAddress)
+                            ); ?>
                         </span>
                         <?php else : ?>
                             <span class="shipping-address">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
index da37433758aeb..c69d453fb81d5 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -17,7 +17,7 @@
     <?php foreach ($_methods as $_method) :
         $_code = $_method->getCode();
         $_counter++;
-    ?>
+        ?>
         <dt class="admin__field-option">
         <?php if ($_methodsCount > 1) : ?>
             <input id="p_method_<?= $block->escapeHtml($_code); ?>"
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php
index 91369da7aa842..a2176364178dc 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php
@@ -21,7 +21,7 @@
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);
 $coupon->setRuleId($items[1]->getId())->setCode('autogenerated_2_2')->setType(1)->save();
 
-// type SPECIFIC with generated coupons 
+// type SPECIFIC with generated coupons
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);
 $coupon->setRuleId($items[2]->getId())->setCode('autogenerated_3_1')->setType(1)->save();
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
index ca3fe64f6d153..4f0bf5d8b394c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
@@ -69,7 +69,7 @@ public function testCollectEntities()
         );
 
         $this->assertEquals(
-            ['\Magento\Eav\Api\Data\AttributeExtensionInterface'],
+            [\Magento\Eav\Api\Data\AttributeExtensionInterface::class],
             $this->_model->collectEntities($this->_testFiles)
         );
     }

From 2a2751904436f6f5ace67dad0127fd3c8ba59dcd Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Fri, 29 Jun 2018 13:50:19 -0500
Subject: [PATCH 087/127] MC-2338: 3rd party library/dependency upgrade for 2.3
 pre Alpha

---
 composer.json |  2 +-
 composer.lock | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 71687f31aa88a..f8182c96f78a0 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.6",
         "elasticsearch/elasticsearch": "~2.0|~5.1",
-        "magento/composer": "dev-MC-2338",
+        "magento/composer": "~1.4.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "magento/zendframework1": "~1.14.0",
         "monolog/monolog": "^1.17",
diff --git a/composer.lock b/composer.lock
index 6e9bcdadbdd61..0966aee19489e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "88f0d1a32d247ad565f3b62c37c744a1",
+    "content-hash": "c6ae2be0f066e566e8280b2954aad257",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -713,16 +713,16 @@
         },
         {
             "name": "magento/composer",
-            "version": "dev-MC-2338",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/composer.git",
-                "reference": "7fadf1404ea221d8935003e75ad490b31f28bf34"
+                "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/composer/zipball/7fadf1404ea221d8935003e75ad490b31f28bf34",
-                "reference": "7fadf1404ea221d8935003e75ad490b31f28bf34",
+                "url": "https://api.github.com/repos/magento/composer/zipball/6fb9eb3dd72a5e70aa53983f132f8e1883e79978",
+                "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978",
                 "shasum": ""
             },
             "require": {
@@ -745,7 +745,7 @@
                 "AFL-3.0"
             ],
             "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-            "time": "2018-06-28T21:28:52+00:00"
+            "time": "2018-06-29T18:46:51+00:00"
         },
         {
             "name": "magento/magento-composer-installer",
@@ -6921,7 +6921,6 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "magento/composer": 20,
         "phpmd/phpmd": 0
     },
     "prefer-stable": true,

From 4592a82fd32ef7acab3ce3dea4d73acabfca2ac7 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Fri, 29 Jun 2018 14:18:26 -0500
Subject: [PATCH 088/127] MC-2338: 3rd party library/dependency upgrade for 2.3
 pre Alpha

---
 .../TestFramework/Unit/Matcher/MethodInvokedAtIndex.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
index 5d1d48cee7ee6..ba5fb89ba8e85 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
@@ -76,6 +76,7 @@ public function matches(BaseInvocation $invocation)
 
     /**
      * @param BaseInvocation $invocation
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function invoked(BaseInvocation $invocation)
     {

From 21f68dd73a038064ab6559c685b648e54183b547 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Fri, 29 Jun 2018 15:10:18 -0500
Subject: [PATCH 089/127] MC-2338: 3rd party library/dependency upgrade for 2.3
 pre Alpha

---
 .../TestFramework/Unit/Matcher/MethodInvokedAtIndex.php    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
index ba5fb89ba8e85..c7d62205dcaf9 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php
@@ -49,7 +49,7 @@ public function __construct($sequenceIndex)
     /**
      * @return string
      */
-    public function toString()
+    public function toString(): string
     {
         return 'invoked at sequence index ' . $this->sequenceIndex;
     }
@@ -58,7 +58,7 @@ public function toString()
      * @param  \PHPUnit\Framework\MockObject\Invocation $invocation
      * @return boolean
      */
-    public function matches(BaseInvocation $invocation)
+    public function matches(BaseInvocation $invocation): bool
     {
         /** @noinspection PhpUndefinedFieldInspection */
         if (!isset($this->indexes[$invocation->getMethodName()])) {
@@ -76,6 +76,7 @@ public function matches(BaseInvocation $invocation)
 
     /**
      * @param BaseInvocation $invocation
+     * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function invoked(BaseInvocation $invocation)
@@ -88,7 +89,7 @@ public function invoked(BaseInvocation $invocation)
      *
      * @throws ExpectationFailedException
      */
-    public function verify()
+    public function verify(): void
     {
         if ($this->currentIndex < $this->sequenceIndex) {
             throw new ExpectationFailedException(

From 2c9392b43cbd549f66cec9ad855bec59ad392dc4 Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Sat, 30 Jun 2018 07:46:05 +0300
Subject: [PATCH 090/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Magento/Framework/Code/GeneratorTest.php  | 196 +++++++-----------
 ...ionAttributesInterfaceFactoryGenerator.php |   1 -
 .../Code/Generator/EntityAbstract.php         |  12 +-
 .../Unit/Generator/EntityAbstractTest.php     |  41 ++--
 .../Code/Test/Unit/GeneratorTest.php          |  56 +++--
 5 files changed, 143 insertions(+), 163 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
index 42a8c0618bfdb..4c0d14a960c51 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
@@ -5,12 +5,13 @@
  */
 namespace Magento\Framework\Code;
 
+use Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceFactoryGenerator;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Interception\Code\Generator as InterceptionGenerator;
 use Magento\Framework\ObjectManager\Code\Generator as DIGenerator;
-use Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceFactoryGenerator;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 require_once __DIR__ . '/GeneratorTest/SourceClassWithNamespace.php';
 require_once __DIR__ . '/GeneratorTest/ParentClassWithNamespace.php';
@@ -20,83 +21,74 @@
  * @magentoAppIsolation enabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class GeneratorTest extends \PHPUnit\Framework\TestCase
+class GeneratorTest extends TestCase
 {
-    const CLASS_NAME_WITH_NAMESPACE = \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace::class;
+    const CLASS_NAME_WITH_NAMESPACE = GeneratorTest\SourceClassWithNamespace::class;
 
     /**
-     * @var \Magento\Framework\Code\Generator
+     * @var Generator
      */
     protected $_generator;
 
     /**
-     * @var \Magento\Framework\Code\Generator\Io
+     * @var Generator/Io
      */
     protected $_ioObject;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\Write
+     * @var Filesystem\Directory\Write
      */
-    protected $generatedDirectory;
+    private $generatedDirectory;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\Read
+     * @var Filesystem\Directory\Read
      */
     private $logDirectory;
 
     /**
-     * @var int
+     * @var string
      */
-    private $oldPermissionGenerationDir;
+    private $testRelativePath = './Magento/Framework/Code/GeneratorTest/';
 
     /**
      * @inheritdoc
      */
     protected function setUp()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
         /** @var Filesystem $filesystem */
-        $filesystem = $objectManager->get(\Magento\Framework\Filesystem::class);
+        $filesystem = $objectManager->get(Filesystem::class);
         $this->generatedDirectory = $filesystem->getDirectoryWrite(DirectoryList::GENERATED_CODE);
         $this->logDirectory = $filesystem->getDirectoryRead(DirectoryList::LOG);
-        $generatedDirectory = $this->generatedDirectory->getAbsolutePath();
-        $this->_ioObject = new \Magento\Framework\Code\Generator\Io(
-            new \Magento\Framework\Filesystem\Driver\File(),
-            $generatedDirectory
-        );
+        $generatedDirectoryAbsolutePath = $this->generatedDirectory->getAbsolutePath();
+        $this->_ioObject = new Generator\Io(new Filesystem\Driver\File(), $generatedDirectoryAbsolutePath);
         $this->_generator = $objectManager->create(
-            \Magento\Framework\Code\Generator::class,
+            Generator::class,
             [
                 'ioObject' => $this->_ioObject,
                 'generatedEntities' => [
                     ExtensionAttributesInterfaceFactoryGenerator::ENTITY_TYPE =>
                         ExtensionAttributesInterfaceFactoryGenerator::class,
-                    DIGenerator\Factory::ENTITY_TYPE => \Magento\Framework\ObjectManager\Code\Generator\Factory::class,
-                    DIGenerator\Proxy::ENTITY_TYPE => \Magento\Framework\ObjectManager\Code\Generator\Proxy::class,
-                    InterceptionGenerator\Interceptor::ENTITY_TYPE =>
-                        \Magento\Framework\Interception\Code\Generator\Interceptor::class,
+                    DIGenerator\Factory::ENTITY_TYPE => DIGenerator\Factory::class,
+                    DIGenerator\Proxy::ENTITY_TYPE => DIGenerator\Proxy::class,
+                    InterceptionGenerator\Interceptor::ENTITY_TYPE => InterceptionGenerator\Interceptor::class,
                 ]
             ]
         );
         $this->_generator->setObjectManager($objectManager);
-
-        if (file_exists($generatedDirectory)) {
-            $this->oldPermissionGenerationDir = fileperms($generatedDirectory);
-        }
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
-        $this->generatedDirectory->changePermissionsRecursively('./', 0777, 0666);
-        $this->generatedDirectory->delete();
         $this->_generator = null;
-
-        if ($this->oldPermissionGenerationDir) {
-            mkdir(
-                $this->generatedDirectory->getAbsolutePath(),
-                $this->oldPermissionGenerationDir,
-                true
-            );
+        if ($this->generatedDirectory->isExist($this->testRelativePath)) {
+            if (!$this->generatedDirectory->isWritable($this->testRelativePath)) {
+                $this->generatedDirectory->changePermissionsRecursively($this->testRelativePath, 0775, 0664);
+            }
+            $this->generatedDirectory->delete($this->testRelativePath);
         }
     }
 
@@ -105,81 +97,59 @@ protected function _clearDocBlock($classBody)
         return preg_replace('/(\/\*[\w\W]*)\nclass/', 'class', $classBody);
     }
 
+    /**
+     * Generates a new file with Factory class and compares with the sample from the
+     * SourceClassWithNamespaceFactory.php.sample file.
+     */
     public function testGenerateClassFactoryWithNamespace()
     {
         $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'Factory';
-        $result = false;
-        $generatorResult = $this->_generator->generateClass($factoryClassName);
-        if (\Magento\Framework\Code\Generator::GENERATION_ERROR !== $generatorResult) {
-            $result = true;
-        }
-        $this->assertTrue($result, 'Failed asserting that \'' . (string)$generatorResult . '\' equals \'success\'.');
-
-        $factory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create($factoryClassName);
-
-        $object = $factory->create();
-        $this->assertInstanceOf(self::CLASS_NAME_WITH_NAMESPACE, $object);
-
-        // This test is only valid if the factory created the object if Autoloader did not pick it up automatically
-        if (\Magento\Framework\Code\Generator::GENERATION_SUCCESS == $generatorResult) {
-            $content = $this->_clearDocBlock(
-                file_get_contents(
-                    $this->_ioObject->generateResultFileName(self::CLASS_NAME_WITH_NAMESPACE . 'Factory')
-                )
-            );
-            $expectedContent = $this->_clearDocBlock(
-                file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceFactory.php.sample')
-            );
-            $this->assertEquals($expectedContent, $content);
-        }
+        $this->assertEquals(Generator::GENERATION_SUCCESS, $this->_generator->generateClass($factoryClassName));
+        $factory = Bootstrap::getObjectManager()->create($factoryClassName);
+        $this->assertInstanceOf(self::CLASS_NAME_WITH_NAMESPACE, $factory->create());
+        $content = $this->_clearDocBlock(
+            file_get_contents($this->_ioObject->generateResultFileName($factoryClassName))
+        );
+        $expectedContent = $this->_clearDocBlock(
+            file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceFactory.php.sample')
+        );
+        $this->assertEquals($expectedContent, $content);
     }
 
+    /**
+     * Generates a new file with Proxy class and compares with the sample from the
+     * SourceClassWithNamespaceProxy.php.sample file.
+     */
     public function testGenerateClassProxyWithNamespace()
     {
         $proxyClassName = self::CLASS_NAME_WITH_NAMESPACE . '\Proxy';
-        $result = false;
-        $generatorResult = $this->_generator->generateClass($proxyClassName);
-        if (\Magento\Framework\Code\Generator::GENERATION_ERROR !== $generatorResult) {
-            $result = true;
-        }
-        $this->assertTrue($result, 'Failed asserting that \'' . (string)$generatorResult . '\' equals \'success\'.');
-
-        $proxy = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create($proxyClassName);
+        $this->assertEquals(Generator::GENERATION_SUCCESS, $this->_generator->generateClass($proxyClassName));
+        $proxy = Bootstrap::getObjectManager()->create($proxyClassName);
         $this->assertInstanceOf(self::CLASS_NAME_WITH_NAMESPACE, $proxy);
-
-        // This test is only valid if the factory created the object if Autoloader did not pick it up automatically
-        if (\Magento\Framework\Code\Generator::GENERATION_SUCCESS == $generatorResult) {
-            $content = $this->_clearDocBlock(
-                file_get_contents($this->_ioObject->generateResultFileName(self::CLASS_NAME_WITH_NAMESPACE . '\Proxy'))
-            );
-            $expectedContent = $this->_clearDocBlock(
-                file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceProxy.php.sample')
-            );
-            $this->assertEquals($expectedContent, $content);
-        }
+        $content = $this->_clearDocBlock(
+            file_get_contents($this->_ioObject->generateResultFileName($proxyClassName))
+        );
+        $expectedContent = $this->_clearDocBlock(
+            file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceProxy.php.sample')
+        );
+        $this->assertEquals($expectedContent, $content);
     }
 
+    /**
+     * Generates a new file with Interceptor class and compares with the sample from the
+     * SourceClassWithNamespaceInterceptor.php.sample file.
+     */
     public function testGenerateClassInterceptorWithNamespace()
     {
         $interceptorClassName = self::CLASS_NAME_WITH_NAMESPACE . '\Interceptor';
-        $result = false;
-        $generatorResult = $this->_generator->generateClass($interceptorClassName);
-        if (\Magento\Framework\Code\Generator::GENERATION_ERROR !== $generatorResult) {
-            $result = true;
-        }
-        $this->assertTrue($result, 'Failed asserting that \'' . (string)$generatorResult . '\' equals \'success\'.');
-
-        if (\Magento\Framework\Code\Generator::GENERATION_SUCCESS == $generatorResult) {
-            $content = $this->_clearDocBlock(
-                file_get_contents(
-                    $this->_ioObject->generateResultFileName(self::CLASS_NAME_WITH_NAMESPACE . '\Interceptor')
-                )
-            );
-            $expectedContent = $this->_clearDocBlock(
-                file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceInterceptor.php.sample')
-            );
-            $this->assertEquals($expectedContent, $content);
-        }
+        $this->assertEquals(Generator::GENERATION_SUCCESS, $this->_generator->generateClass($interceptorClassName));
+        $content = $this->_clearDocBlock(
+            file_get_contents($this->_ioObject->generateResultFileName($interceptorClassName))
+        );
+        $expectedContent = $this->_clearDocBlock(
+            file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceInterceptor.php.sample')
+        );
+        $this->assertEquals($expectedContent, $content);
     }
 
     /**
@@ -189,22 +159,12 @@ public function testGenerateClassInterceptorWithNamespace()
     public function testGenerateClassExtensionAttributesInterfaceFactoryWithNamespace()
     {
         $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'ExtensionInterfaceFactory';
-        $this->generatedDirectory->create(
-            $this->generatedDirectory->getAbsolutePath() . '/Magento/Framework/Code/GeneratorTest/'
-        );
-
-        $generatorResult = $this->_generator->generateClass($factoryClassName);
-
+        $this->generatedDirectory->create($this->testRelativePath);
+        $this->assertEquals(Generator::GENERATION_SUCCESS, $this->_generator->generateClass($factoryClassName));
         $factory = Bootstrap::getObjectManager()->create($factoryClassName);
-        $object = $factory->create();
-
-        $this->assertEquals($generatorResult, Generator::GENERATION_SUCCESS);
-        $this->assertInstanceOf(self::CLASS_NAME_WITH_NAMESPACE . 'Extension', $object);
-
+        $this->assertInstanceOf(self::CLASS_NAME_WITH_NAMESPACE . 'Extension', $factory->create());
         $content = $this->_clearDocBlock(
-            file_get_contents(
-                $this->_ioObject->generateResultFileName(self::CLASS_NAME_WITH_NAMESPACE . 'ExtensionInterfaceFactory')
-            )
+            file_get_contents($this->_ioObject->generateResultFileName($factoryClassName))
         );
         $expectedContent = $this->_clearDocBlock(
             file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample')
@@ -212,22 +172,22 @@ public function testGenerateClassExtensionAttributesInterfaceFactoryWithNamespac
         $this->assertEquals($expectedContent, $content);
     }
 
+    /**
+     * It tries to generate a new class file if the generated directory is read-only
+     */
     public function testGeneratorClassWithErrorSaveClassFile()
     {
         $msgPart = 'Error: an object of a generated class may be a dependency for another object, '
             . 'but this dependency has not been defined or set correctly in the signature of the related construct '
             . 'method';
-
         $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessageRegExp("/^$msgPart.*/");
-        $this->generatedDirectory->changePermissionsRecursively('./', 0555, 0444);
-        $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'ExtensionInterfaceFactory';
-
+        $this->expectExceptionMessageRegExp("/.*$msgPart.*/");
+        $this->generatedDirectory->create($this->testRelativePath);
+        $this->generatedDirectory->changePermissionsRecursively($this->testRelativePath, 0555, 0444);
+        $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'Factory';
         $generatorResult = $this->_generator->generateClass($factoryClassName);
         $this->assertFalse($generatorResult);
-
         $pathToSystemLog = $this->logDirectory->getAbsolutePath('system.log');
-        $logs = array_slice(file($pathToSystemLog), -2);
-        $this->assertContains($msgPart, $logs[0]);
+        $this->assertContains($msgPart, file_get_contents($pathToSystemLog));
     }
 }
diff --git a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php
index 12af882a46760..4f146dab01dc2 100644
--- a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php
+++ b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Framework\Api\Code\Generator;
 
 use Magento\Framework\ObjectManager\Code\Generator\Factory;
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index 0a2dcd6e6c2df..90a290dc90782 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -7,6 +7,8 @@
 
 use Magento\Framework\Exception\FileSystemException;
 use Zend\Code\Generator\ValueGenerator;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\ObjectManagerInterface;
 
 abstract class EntityAbstract
 {
@@ -42,7 +44,7 @@ abstract class EntityAbstract
     /**
      * Class generator object
      *
-     * @var \Magento\Framework\Code\Generator\CodeGeneratorInterface
+     * @var CodeGeneratorInterface
      */
     protected $_classGenerator;
 
@@ -55,20 +57,20 @@ abstract class EntityAbstract
      * @param null|string $sourceClassName
      * @param null|string $resultClassName
      * @param Io $ioObject
-     * @param \Magento\Framework\Code\Generator\CodeGeneratorInterface $classGenerator
+     * @param CodeGeneratorInterface $classGenerator
      * @param DefinedClasses $definedClasses
      */
     public function __construct(
         $sourceClassName = null,
         $resultClassName = null,
         Io $ioObject = null,
-        \Magento\Framework\Code\Generator\CodeGeneratorInterface $classGenerator = null,
+        CodeGeneratorInterface $classGenerator = null,
         DefinedClasses $definedClasses = null
     ) {
         if ($ioObject) {
             $this->_ioObject = $ioObject;
         } else {
-            $this->_ioObject = new Io(new \Magento\Framework\Filesystem\Driver\File());
+            $this->_ioObject = new Io(new File());
         }
         if ($classGenerator) {
             $this->_classGenerator = $classGenerator;
@@ -201,7 +203,7 @@ protected function _getClassProperties()
             'visibility' => 'protected',
             'docblock' => [
                 'shortDescription' => 'Object Manager instance',
-                'tags' => [['name' => 'var', 'description' => '\\' . \Magento\Framework\ObjectManagerInterface::class]],
+                'tags' => [['name' => 'var', 'description' => '\\' . ObjectManagerInterface::class]],
             ],
         ];
 
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
index 62470a6aafb39..e3b21a2385a7d 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
@@ -7,8 +7,15 @@
 
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Phrase;
-
-class EntityAbstractTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\DataObject;
+use Magento\Framework\DataObject_MyResult;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\Code\Generator\EntityAbstract;
+use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\Code\Generator\ClassGenerator;
+use Magento\Framework\Code\Generator\DefinedClasses;
+
+class EntityAbstractTest extends TestCase
 {
     /**#@+
      * Source and result class parameters
@@ -52,9 +59,9 @@ class EntityAbstractTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->sourceClass = '\\' . \Magento\Framework\DataObject::class;
-        $this->resultClass = '\\' . \Magento\Framework\DataObject_MyResult::class;
-        $this->_model = $this->getMockForAbstractClass(\Magento\Framework\Code\Generator\EntityAbstract::class);
+        $this->sourceClass = '\\' . DataObject::class;
+        $this->resultClass = '\\' . DataObject_MyResult::class;
+        $this->_model = $this->getMockForAbstractClass(EntityAbstract::class);
     }
 
     protected function tearDown()
@@ -67,21 +74,21 @@ public function testConstruct()
         // without parameters
         $this->assertAttributeEmpty('_sourceClassName', $this->_model);
         $this->assertAttributeEmpty('_resultClassName', $this->_model);
-        $this->assertAttributeInstanceOf(\Magento\Framework\Code\Generator\Io::class, '_ioObject', $this->_model);
+        $this->assertAttributeInstanceOf(Io::class, '_ioObject', $this->_model);
         $this->assertAttributeInstanceOf(
-            \Magento\Framework\Code\Generator\ClassGenerator::class,
+            ClassGenerator::class,
             '_classGenerator',
             $this->_model
         );
         $this->assertAttributeInstanceOf(
-            \Magento\Framework\Code\Generator\DefinedClasses::class,
+            DefinedClasses::class,
             'definedClasses',
             $this->_model
         );
 
         // with source class name
         $this->_model = $this->getMockForAbstractClass(
-            \Magento\Framework\Code\Generator\EntityAbstract::class,
+            EntityAbstract::class,
             [$this->sourceClass]
         );
         $this->assertAttributeEquals($this->sourceClass, '_sourceClassName', $this->_model);
@@ -89,15 +96,15 @@ public function testConstruct()
 
         // with all arguments
         // Configure IoObject mock
-        $ioObject = $this->getMockBuilder(\Magento\Framework\Code\Generator\Io::class)
+        $ioObject = $this->getMockBuilder(Io::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $codeGenerator = $this->getMockBuilder(\Magento\Framework\Code\Generator\ClassGenerator::class)
+        $codeGenerator = $this->getMockBuilder(ClassGenerator::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->_model = $this->getMockForAbstractClass(
-            \Magento\Framework\Code\Generator\EntityAbstract::class,
+            EntityAbstract::class,
             [$this->sourceClass, $this->resultClass, $ioObject, $codeGenerator]
         );
         $this->assertAttributeEquals($this->resultClass, '_resultClassName', $this->_model);
@@ -189,7 +196,7 @@ public function testGenerate(
         }
         $abstractGetters = ['_getClassProperties', '_getClassMethods'];
         $this->_model = $this->getMockForAbstractClass(
-            \Magento\Framework\Code\Generator\EntityAbstract::class,
+            EntityAbstract::class,
             $arguments,
             '',
             true,
@@ -239,7 +246,7 @@ public function testGenerateFailure()
             ->willThrowException(new FileSystemException(new Phrase($exceptionMessage)));
 
         $this->_model = $this->getMockForAbstractClass(
-            \Magento\Framework\Code\Generator\EntityAbstract::class,
+            EntityAbstract::class,
             $arguments,
             '',
             true,
@@ -274,7 +281,7 @@ protected function _prepareMocksForValidateData(
         $resultFileExists = false
     ) {
         // Configure DefinedClasses mock
-        $definedClassesMock = $this->createMock(\Magento\Framework\Code\Generator\DefinedClasses::class);
+        $definedClassesMock = $this->createMock(DefinedClasses::class);
         $definedClassesMock->expects($this->once())
             ->method('isClassLoadable')
             ->with($this->sourceClass)
@@ -287,7 +294,7 @@ protected function _prepareMocksForValidateData(
         }
 
         // Configure IoObject mock
-        $ioObject = $this->getMockBuilder(\Magento\Framework\Code\Generator\Io::class)
+        $ioObject = $this->getMockBuilder(Io::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -320,7 +327,7 @@ protected function _prepareMocksForGenerateCode($willWriteCode)
         // Configure mocks for the validation step
         $mocks = $this->_prepareMocksForValidateData();
 
-        $codeGenerator = $this->getMockBuilder(\Magento\Framework\Code\Generator\ClassGenerator::class)
+        $codeGenerator = $this->getMockBuilder(ClassGenerator::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index a76b9582906cb..f98444fa3c316 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -9,8 +9,16 @@
 use Magento\Framework\Code\Generator\DefinedClasses;
 use Magento\Framework\Code\Generator\Io;
 use Psr\Log\LoggerInterface;
-
-class GeneratorTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\ObjectManager\Code\Generator\Factory;
+use Magento\Framework\ObjectManager\Code\Generator\Proxy;
+use Magento\Framework\Interception\Code\Generator\Interceptor;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Code\Generator\EntityAbstract;
+use Magento\GeneratedClass\Factory as GeneratedClassFactory;
+
+class GeneratorTest extends TestCase
 {
     /**
      * Class name parameter value
@@ -23,36 +31,40 @@ class GeneratorTest extends \PHPUnit\Framework\TestCase
      * @var array
      */
     protected $expectedEntities = [
-        'factory' => \Magento\Framework\ObjectManager\Code\Generator\Factory::ENTITY_TYPE,
-        'proxy' => \Magento\Framework\ObjectManager\Code\Generator\Proxy::ENTITY_TYPE,
-        'interceptor' => \Magento\Framework\Interception\Code\Generator\Interceptor::ENTITY_TYPE,
+        'factory' => Factory::ENTITY_TYPE,
+        'proxy' => Proxy::ENTITY_TYPE,
+        'interceptor' => Interceptor::ENTITY_TYPE,
     ];
 
     /**
      * System under test
      *
-     * @var \Magento\Framework\Code\Generator
+     * @var Generator
      */
     protected $model;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|Io */
+    /**
+     * @var Io|Mock
+     */
     protected $ioObjectMock;
 
-    /** @var \Magento\Framework\Code\Generator\DefinedClasses | \PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var DefinedClasses | Mock
+     */
     protected $definedClassesMock;
 
     protected function setUp()
     {
-        $this->definedClassesMock = $this->createMock(\Magento\Framework\Code\Generator\DefinedClasses::class);
-        $this->ioObjectMock = $this->getMockBuilder(\Magento\Framework\Code\Generator\Io::class)
+        $this->definedClassesMock = $this->createMock(DefinedClasses::class);
+        $this->ioObjectMock = $this->getMockBuilder(Io::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->model = $this->buildModel(
             $this->ioObjectMock,
             [
-                'factory' => \Magento\Framework\ObjectManager\Code\Generator\Factory::class,
-                'proxy' => \Magento\Framework\ObjectManager\Code\Generator\Proxy::class,
-                'interceptor' => \Magento\Framework\Interception\Code\Generator\Interceptor::class
+                'factory' => Factory::class,
+                'proxy' => Proxy::class,
+                'interceptor' => Interceptor::class
             ],
             $this->definedClassesMock
         );
@@ -74,9 +86,9 @@ public function testGetGeneratedEntities()
      */
     public function testGenerateClass($className, $entityType)
     {
-        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
         $fullClassName = $className . $entityType;
-        $entityGeneratorMock = $this->getMockBuilder(\Magento\Framework\Code\Generator\EntityAbstract::class)
+        $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
             ->disableOriginalConstructor()
             ->getMock();
         $objectManagerMock->expects($this->once())->method('create')->willReturn($entityGeneratorMock);
@@ -87,7 +99,7 @@ public function testGenerateClass($className, $entityType)
     public function testGenerateClassWithWrongName()
     {
         $this->assertEquals(
-            \Magento\Framework\Code\Generator::GENERATION_ERROR,
+            Generator::GENERATION_ERROR,
             $this->model->generateClass(self::SOURCE_CLASS)
         );
     }
@@ -99,8 +111,8 @@ public function testGenerateClassWhenClassIsNotGenerationSuccess()
     {
         $expectedEntities = array_values($this->expectedEntities);
         $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
-        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-        $entityGeneratorMock = $this->getMockBuilder(\Magento\Framework\Code\Generator\EntityAbstract::class)
+        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+        $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
             ->disableOriginalConstructor()
             ->getMock();
         $objectManagerMock->expects($this->once())->method('create')->willReturn($entityGeneratorMock);
@@ -122,8 +134,8 @@ public function testGenerateClassWithErrors()
         ];
         $expectedEntities = array_values($this->expectedEntities);
         $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
-        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-        $entityGeneratorMock = $this->getMockBuilder(\Magento\Framework\Code\Generator\EntityAbstract::class)
+        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+        $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
             ->disableOriginalConstructor()
             ->getMock();
         $loggerMock = $this->createMock(LoggerInterface::class);
@@ -167,8 +179,8 @@ public function testGenerateClassWithExistName($fileExists)
         $this->ioObjectMock->expects($this->exactly($includeFileInvokeCount))->method('includeFile');
 
         $this->assertEquals(
-            \Magento\Framework\Code\Generator::GENERATION_SKIP,
-            $this->model->generateClass(\Magento\GeneratedClass\Factory::class)
+            Generator::GENERATION_SKIP,
+            $this->model->generateClass(GeneratedClassFactory::class)
         );
     }
 

From 5c253f01462fa27ee77d859a484bc5f259b1f505 Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Sat, 30 Jun 2018 08:31:15 +0300
Subject: [PATCH 091/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Generator/ExtensionAttributesInterfaceFactoryGenerator.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php
index 4f146dab01dc2..12af882a46760 100644
--- a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php
+++ b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Api\Code\Generator;
 
 use Magento\Framework\ObjectManager\Code\Generator\Factory;

From cc5c33b72631941fc3585bbdebdf1eef46886c79 Mon Sep 17 00:00:00 2001
From: Diederick Bruin <diederick@marissen.net>
Date: Fri, 25 May 2018 16:07:53 +0200
Subject: [PATCH 092/127] Move breadcrumb json configuration to viewmodel

---
 .../Catalog/ViewModel/Product/Breadcrumbs.php | 27 ++++++++++++++++++-
 .../templates/product/breadcrumbs.phtml       |  9 +------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
index 4c3945569db2a..c883d042a572c 100644
--- a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
@@ -10,6 +10,7 @@
 use Magento\Catalog\Helper\Data;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 
 /**
@@ -29,18 +30,26 @@ class Breadcrumbs extends DataObject implements ArgumentInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var Json
+     */
+    private $json;
+
     /**
      * @param Data $catalogData
      * @param ScopeConfigInterface $scopeConfig
+     * @param Json $json
      */
     public function __construct(
         Data $catalogData,
-        ScopeConfigInterface $scopeConfig
+        ScopeConfigInterface $scopeConfig,
+        Json $json
     ) {
         parent::__construct();
 
         $this->catalogData = $catalogData;
         $this->scopeConfig = $scopeConfig;
+        $this->json = $json;
     }
 
     /**
@@ -80,4 +89,20 @@ public function getProductName(): string
             ? $this->catalogData->getProduct()->getName()
             : '';
     }
+
+    /**
+     * Returns breadcrumb json.
+     *
+     * @return string
+     */
+    public function getJsonConfiguration()
+    {
+        return $this->json->serialize([
+            'breadcrumbs' => [
+                'categoryUrlSuffix' => $this->getCategoryUrlSuffix(),
+                'userCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
+                'product' => $this->getProductName()
+            ]
+        ]);
+    }
 }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
index 063f8857329e5..d66aa5e5edb28 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
@@ -7,11 +7,4 @@
 /** @var \Magento\Catalog\ViewModel\Product\Breadcrumbs $viewModel */
 $viewModel = $block->getData('viewModel');
 ?>
-<div class="breadcrumbs" data-mage-init='{
-    "breadcrumbs": {
-        "categoryUrlSuffix": "<?= $block->escapeHtml($viewModel->getCategoryUrlSuffix()); ?>",
-        "useCategoryPathInUrl": <?= (int)$viewModel->isCategoryUsedInProductUrl(); ?>,
-        "product": "<?= $block->escapeHtml($block->escapeJs($viewModel->getProductName())); ?>"
-    }
-}'>
-</div>
+<div class="breadcrumbs" data-mage-init='<?= $viewModel->getJsonConfiguration() ?>'></div>

From ce39035573393cdde1884753dc47cc8ce69a729c Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Mon, 28 May 2018 12:18:09 +0530
Subject: [PATCH 093/127] Added escape text.

---
 .../Catalog/view/frontend/templates/product/breadcrumbs.phtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
index d66aa5e5edb28..c54ce5340851c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
@@ -7,4 +7,4 @@
 /** @var \Magento\Catalog\ViewModel\Product\Breadcrumbs $viewModel */
 $viewModel = $block->getData('viewModel');
 ?>
-<div class="breadcrumbs" data-mage-init='<?= $viewModel->getJsonConfiguration() ?>'></div>
+<div class="breadcrumbs" data-mage-init='<?= /* @escapeNotVerified */ $viewModel->getJsonConfiguration() ?>'></div>

From 35ce945dd21ce0b1c0c7612a711021e537499a91 Mon Sep 17 00:00:00 2001
From: Timon de Groot <tdegroot96@gmail.com>
Date: Sat, 2 Jun 2018 14:20:43 +0200
Subject: [PATCH 094/127] Make new Json dependency backwards compatible

---
 app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
index c883d042a572c..871d21d8ee8d3 100644
--- a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Helper\Data;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
@@ -43,13 +44,13 @@ class Breadcrumbs extends DataObject implements ArgumentInterface
     public function __construct(
         Data $catalogData,
         ScopeConfigInterface $scopeConfig,
-        Json $json
+        Json $json = null
     ) {
         parent::__construct();
 
         $this->catalogData = $catalogData;
         $this->scopeConfig = $scopeConfig;
-        $this->json = $json;
+        $this->json = $json ?: ObjectManager::getInstance()->get(Json::class);
     }
 
     /**

From 2c4e4731635457aa90210cb66da3d4bf37d87e75 Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Sun, 1 Jul 2018 07:28:04 +0300
Subject: [PATCH 095/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Magento/Framework/Code/Generator.php      | 33 ++++++-------
 .../Code/Generator/EntityAbstract.php         |  4 +-
 .../Unit/Generator/EntityAbstractTest.php     | 46 ++++++++-----------
 .../Code/Test/Unit/GeneratorTest.php          |  6 ++-
 4 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index 1a53ca8814d10..fb20279176ea7 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -7,7 +7,11 @@
 
 use Magento\Framework\Code\Generator\DefinedClasses;
 use Magento\Framework\Code\Generator\EntityAbstract;
+use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\ObjectManagerInterface;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\Filesystem\Driver\File;
 
 class Generator
 {
@@ -18,7 +22,7 @@ class Generator
     const GENERATION_SKIP = 'skip';
 
     /**
-     * @var \Magento\Framework\Code\Generator\Io
+     * @var Io
      */
     protected $_ioObject;
 
@@ -33,24 +37,21 @@ class Generator
     protected $definedClasses;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $objectManager;
 
     /**
-     * @param Generator\Io   $ioObject
-     * @param array          $generatedEntities
+     * @param Generator\Io $ioObject
+     * @param array $generatedEntities
      * @param DefinedClasses $definedClasses
      */
     public function __construct(
-        \Magento\Framework\Code\Generator\Io $ioObject = null,
+        Io $ioObject = null,
         array $generatedEntities = [],
         DefinedClasses $definedClasses = null
     ) {
-        $this->_ioObject = $ioObject
-            ?: new \Magento\Framework\Code\Generator\Io(
-                new \Magento\Framework\Filesystem\Driver\File()
-            );
+        $this->_ioObject = $ioObject ?: new Io(new File());
         $this->definedClasses = $definedClasses ?: new DefinedClasses();
         $this->_generatedEntities = $generatedEntities;
     }
@@ -132,7 +133,7 @@ public function generateClass($className)
      * @param string $generatorClass
      * @param string $entityName
      * @param string $className
-     * @return \Magento\Framework\Code\Generator\EntityAbstract
+     * @return EntityAbstract
      */
     protected function createGeneratorInstance($generatorClass, $entityName, $className)
     {
@@ -145,10 +146,10 @@ protected function createGeneratorInstance($generatorClass, $entityName, $classN
     /**
      * Set object manager instance.
      *
-     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param ObjectManagerInterface $objectManager
      * @return $this
      */
-    public function setObjectManager(\Magento\Framework\ObjectManagerInterface $objectManager)
+    public function setObjectManager(ObjectManagerInterface $objectManager)
     {
         $this->objectManager = $objectManager;
         return $this;
@@ -157,11 +158,11 @@ public function setObjectManager(\Magento\Framework\ObjectManagerInterface $obje
     /**
      * Get object manager instance.
      *
-     * @return \Magento\Framework\ObjectManagerInterface
+     * @return ObjectManagerInterface
      */
     public function getObjectManager()
     {
-        if (!($this->objectManager instanceof \Magento\Framework\ObjectManagerInterface)) {
+        if (!($this->objectManager instanceof ObjectManagerInterface)) {
             throw new \LogicException(
                 "Object manager was expected to be set using setObjectManger() "
                 . "before getObjectManager() invocation."
@@ -174,7 +175,7 @@ public function getObjectManager()
      * Try to load/generate source class to check if it is valid or not.
      *
      * @param string $className
-     * @param \Magento\Framework\Code\Generator\EntityAbstract $generator
+     * @param EntityAbstract $generator
      * @return void
      * @throws \RuntimeException
      */
@@ -183,7 +184,7 @@ protected function tryToLoadSourceClass($className, $generator)
         $sourceClassName = $generator->getSourceClassName();
         if (!$this->definedClasses->isClassLoadable($sourceClassName)) {
             if ($this->generateClass($sourceClassName) !== self::GENERATION_SUCCESS) {
-                $phrase = new \Magento\Framework\Phrase(
+                $phrase = new Phrase(
                     'Source class "%1" for "%2" generation does not exist.',
                     [$sourceClassName, $className]
                 );
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index 90a290dc90782..ae120363f8e52 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -112,8 +112,8 @@ public function generate()
         } catch (FileSystemException $e) {
             $message = 'Error: an object of a generated class may be a dependency for another object, but this '
                 . 'dependency has not been defined or set correctly in the signature of the related construct method. '
-                . 'Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento'
-                . ' deploy:mode:set production` does not create the required generated classes. '
+                . 'Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento '
+                . 'deploy:mode:set production` does not create the required generated classes. '
                 . 'Magento cannot write a class file to the "generated" directory that is read-only. Before using the '
                 . 'read-only file system, the classes to be generated must be created beforehand in the "generated" '
                 . 'directory. For details, see the "File systems access permissions" topic '
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
index e3b21a2385a7d..77a3441aa9dd8 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Code\Generator\Io;
 use Magento\Framework\Code\Generator\ClassGenerator;
 use Magento\Framework\Code\Generator\DefinedClasses;
+use \PHPUnit_Framework_MockObject_MockObject as Mock;
 
 class EntityAbstractTest extends TestCase
 {
@@ -43,7 +44,7 @@ class EntityAbstractTest extends TestCase
     /**
      * Model under test
      *
-     * @var \Magento\Framework\Code\Generator\EntityAbstract| \PHPUnit_Framework_MockObject_MockObject
+     * @var EntityAbstract|Mock
      */
     protected $_model;
 
@@ -75,22 +76,11 @@ public function testConstruct()
         $this->assertAttributeEmpty('_sourceClassName', $this->_model);
         $this->assertAttributeEmpty('_resultClassName', $this->_model);
         $this->assertAttributeInstanceOf(Io::class, '_ioObject', $this->_model);
-        $this->assertAttributeInstanceOf(
-            ClassGenerator::class,
-            '_classGenerator',
-            $this->_model
-        );
-        $this->assertAttributeInstanceOf(
-            DefinedClasses::class,
-            'definedClasses',
-            $this->_model
-        );
+        $this->assertAttributeInstanceOf(ClassGenerator::class, '_classGenerator', $this->_model);
+        $this->assertAttributeInstanceOf(DefinedClasses::class, 'definedClasses', $this->_model);
 
         // with source class name
-        $this->_model = $this->getMockForAbstractClass(
-            EntityAbstract::class,
-            [$this->sourceClass]
-        );
+        $this->_model = $this->getMockForAbstractClass(EntityAbstract::class, [$this->sourceClass]);
         $this->assertAttributeEquals($this->sourceClass, '_sourceClassName', $this->_model);
         $this->assertAttributeEquals($this->sourceClass . 'Abstract', '_resultClassName', $this->_model);
 
@@ -163,17 +153,17 @@ public function generateDataProvider()
      * @param bool $willWriteCode
      *
      * @dataProvider generateDataProvider
-     * @covers \Magento\Framework\Code\Generator\EntityAbstract::generate
-     * @covers \Magento\Framework\Code\Generator\EntityAbstract::getErrors
-     * @covers \Magento\Framework\Code\Generator\EntityAbstract::getSourceClassName
-     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getResultClassName
-     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getDefaultResultClassName
-     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_generateCode
-     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_addError
-     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_validateData
-     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getClassDocBlock
-     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getGeneratedCode
-     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_fixCodeStyle
+     * @covers EntityAbstract::generate
+     * @covers EntityAbstract::getErrors
+     * @covers EntityAbstract::getSourceClassName
+     * @covers EntityAbstract::_getResultClassName
+     * @covers EntityAbstract::_getDefaultResultClassName
+     * @covers EntityAbstract::_generateCode
+     * @covers EntityAbstract::_addError
+     * @covers EntityAbstract::_validateData
+     * @covers EntityAbstract::_getClassDocBlock
+     * @covers EntityAbstract::_getGeneratedCode
+     * @covers EntityAbstract::_fixCodeStyle
      */
     public function testGenerate(
         $errors = [],
@@ -238,7 +228,7 @@ public function testGenerateFailure()
 
         $arguments = $this->_prepareMocksForGenerateCode(true);
 
-        /** @var \Magento\Framework\Code\Generator\Io|\PHPUnit_Framework_MockObject_MockObject $ioObjectMock */
+        /** @var Io|Mock $ioObjectMock */
         $ioObjectMock = $arguments['io_object'];
         $ioObjectMock->expects($this->once())
             ->method('writeResultFile')
@@ -344,7 +334,7 @@ protected function _prepareMocksForGenerateCode($willWriteCode)
             ->will($this->returnValue($willWriteCode ? self::RESULT_CODE : null));
 
         // Add configuration for the generation step
-        /** @var $ioObject \PHPUnit_Framework_MockObject_MockObject */
+        /** @var Io|Mock $ioObject */
         $ioObject = $mocks['io_object'];
         if ($willWriteCode) {
             $ioObject->expects($this->once())->method('writeResultFile')->with(self::RESULT_FILE, self::RESULT_CODE);
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index f98444fa3c316..26ff96b7e86ff 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -49,7 +49,7 @@ class GeneratorTest extends TestCase
     protected $ioObjectMock;
 
     /**
-     * @var DefinedClasses | Mock
+     * @var DefinedClasses|Mock
      */
     protected $definedClassesMock;
 
@@ -81,6 +81,8 @@ public function testGetGeneratedEntities()
     }
 
     /**
+     * @param string $className
+     * @param string $entityType
      * @expectedException \RuntimeException
      * @dataProvider generateValidClassDataProvider
      */
@@ -134,7 +136,9 @@ public function testGenerateClassWithErrors()
         ];
         $expectedEntities = array_values($this->expectedEntities);
         $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
+        /** @var ObjectManagerInterface|Mock $objectManagerMock */
         $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+        /** @var EntityAbstract|Mock $entityGeneratorMock */
         $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
             ->disableOriginalConstructor()
             ->getMock();

From 09498f2486fa3071b8deaa9fbf4e2110a65523cf Mon Sep 17 00:00:00 2001
From: Yevhen Miroshnychenko <ymiroshnychenko@magento.com>
Date: Sun, 1 Jul 2018 08:47:32 +0300
Subject: [PATCH 096/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Unit/Generator/EntityAbstractTest.php     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
index 77a3441aa9dd8..220e13b6d02c9 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
@@ -153,17 +153,17 @@ public function generateDataProvider()
      * @param bool $willWriteCode
      *
      * @dataProvider generateDataProvider
-     * @covers EntityAbstract::generate
-     * @covers EntityAbstract::getErrors
-     * @covers EntityAbstract::getSourceClassName
-     * @covers EntityAbstract::_getResultClassName
-     * @covers EntityAbstract::_getDefaultResultClassName
-     * @covers EntityAbstract::_generateCode
-     * @covers EntityAbstract::_addError
-     * @covers EntityAbstract::_validateData
-     * @covers EntityAbstract::_getClassDocBlock
-     * @covers EntityAbstract::_getGeneratedCode
-     * @covers EntityAbstract::_fixCodeStyle
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::generate
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::getErrors
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::getSourceClassName
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getResultClassName
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getDefaultResultClassName
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_generateCode
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_addError
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_validateData
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getClassDocBlock
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_getGeneratedCode
+     * @covers \Magento\Framework\Code\Generator\EntityAbstract::_fixCodeStyle
      */
     public function testGenerate(
         $errors = [],

From fe307c701c47c553825c278df3d6e2fa5530b1a4 Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Sun, 1 Jul 2018 11:41:29 +0530
Subject: [PATCH 097/127] Fixed whitespace issue at end of line.


From 23c8639e6830ed510a5c05629dfca722b1802050 Mon Sep 17 00:00:00 2001
From: mage2pratik <33807558+mage2pratik@users.noreply.github.com>
Date: Mon, 2 Jul 2018 18:57:05 +0530
Subject: [PATCH 098/127] Update History.php

---
 app/code/Magento/Sales/Block/Order/History.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Block/Order/History.php b/app/code/Magento/Sales/Block/Order/History.php
index 034df4edb5b49..80925f66fc83d 100644
--- a/app/code/Magento/Sales/Block/Order/History.php
+++ b/app/code/Magento/Sales/Block/Order/History.php
@@ -19,7 +19,7 @@ class History extends \Magento\Framework\View\Element\Template
     /**
      * @var string
      */
-    protected $_template = 'order/history.phtml';
+    protected $_template = 'Magento_Sales::order/history.phtml';
 
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory

From e4756d6584300f47adb1d3fe293171d6b323712e Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Mon, 2 Jul 2018 17:47:39 +0300
Subject: [PATCH 099/127] MAGETWO-88645: Error while deleting a Product Image

---
 .../Catalog/Model/Product/Gallery/UpdateHandlerTest.php  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
index 703e83c70c267..81207e9388021 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
@@ -19,6 +19,7 @@
  * Test for \Magento\Catalog\Model\Product\Gallery\UpdateHandler.
  *
  * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDataFixture Magento/Catalog/_files/product_image.php
  */
 class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
 {
@@ -58,10 +59,7 @@ protected function setUp()
         $this->updateHandler = $this->objectManager->create(UpdateHandler::class);
         $this->filesystem = $this->objectManager->get(Filesystem::class);
         $this->rootDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::ROOT);
-
-        $filePath = $this->rootDirectory->getAbsolutePath($this->fileName);
-        $file = fopen($filePath, "wb");
-        fwrite($file, 'Test');
+        $this->rootDirectory->writeFile($this->rootDirectory->getAbsolutePath($this->fileName), 'Test');
     }
 
     /**
@@ -97,7 +95,6 @@ public function testExecuteWithIllegalFilename(): void
      */
     protected function tearDown(): void
     {
-        parent::tearDown();
-        unlink($this->rootDirectory->getAbsolutePath($this->fileName));
+        $this->rootDirectory->getDriver()->deleteFile($this->rootDirectory->getAbsolutePath($this->fileName));
     }
 }

From 104cad4ff340a2d5aad234c1a1a74920e423e7ed Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <fanta1408@gmail.com>
Date: Mon, 2 Jul 2018 18:07:53 +0300
Subject: [PATCH 100/127]     MAGETWO-90301: Extend MFTF tests to check
 Checkout Success page

---
 .../Checkout/Test/CheckCheckoutSuccessPageTest.xml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
index 89fafcd8bd9d8..9564e4626976a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
@@ -116,7 +116,7 @@
         <resizeWindow width="600" height="800" stepKey="resizeWindow"/>
         <waitForElementNotVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitInvisiblePrint"/>
         <dontSeeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeInvisiblePrint"/>
-        <maximizeWindow stepKey="maximizeWindowKey1"/>
+        <resizeWindow width="1360" height="1020" stepKey="maximizeWindowKey1"/>
         <waitForElementVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitVisiblePrint"/>
         <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint2" />
 

From afcfecbb33ac36ad0ebe09eb5ea703132f1d3812 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Mon, 2 Jul 2018 16:12:18 -0500
Subject: [PATCH 101/127] MC-2338: 3rd party library/dependency upgrade for 2.3
 pre Alpha

---
 .../Unit/ReportXml/DB/ReportValidatorTest.php  |  4 ++--
 .../Test/Unit/Controller/Index/IndexTest.php   |  4 ++--
 .../Command/ConfigShow/ValueProcessorTest.php  | 18 +++++++++---------
 .../ElementVisibilityCompositeTest.php         |  8 ++++----
 .../Product/Form/Modifier/Data/LinksTest.php   |  4 ++--
 .../CheckExpirePersistentQuoteObserverTest.php | 12 ++++++------
 .../ResourceModel/Order/CollectionTest.php     |  4 ++--
 .../Report/Product/ViewedTest.php              |  4 ++--
 .../Order/Email/Sender/AbstractSenderTest.php  |  4 ++--
 lib/internal/Magento/Framework/File/Size.php   |  4 ++--
 .../Framework/Filesystem/File/Write.php        |  2 +-
 .../Filesystem/File/WriteInterface.php         |  2 +-
 .../Module/Test/Unit/Setup/MigrationTest.php   |  2 +-
 .../TestFramework/Unit/Block/Adminhtml.php     |  4 ++--
 .../TestFramework/Unit/Helper/ProxyTesting.php |  4 ++--
 .../Test/Unit/Element/AbstractBlockTest.php    |  6 +++---
 .../Test/Unit/Layout/Data/StructureTest.php    |  2 +-
 .../Test/Unit/Layout/Generator/BlockTest.php   |  8 ++++----
 .../View/Test/Unit/Layout/Reader/BlockTest.php | 12 ++++++------
 .../Test/Unit/Layout/Reader/ContainerTest.php  |  6 +++---
 .../Layout/ScheduledStructure/HelperTest.php   |  2 +-
 .../View/Test/Unit/Result/LayoutTest.php       |  4 ++--
 .../Module/Di/Code/Scanner/PhpScannerTest.php  |  2 +-
 23 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php
index d7dcf50620550..ac141fae4be66 100644
--- a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php
@@ -79,9 +79,9 @@ protected function setUp()
      * @dataProvider errorDataProvider
      * @param string $reportName
      * @param array $result
-     * @param \PHPUnit_Framework_MockObject_Stub $queryReturnStub
+     * @param \PHPUnit\Framework\MockObject\Stub $queryReturnStub
      */
-    public function testValidate($reportName, $result, \PHPUnit_Framework_MockObject_Stub $queryReturnStub)
+    public function testValidate($reportName, $result, \PHPUnit\Framework\MockObject\Stub $queryReturnStub)
     {
         $connectionName = 'testConnection';
         $this->queryFactoryMock->expects($this->once())
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
index 04723c5894f8f..b7ff79fc3c200 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php
@@ -10,8 +10,8 @@
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use PHPUnit_Framework_MockObject_Builder_InvocationMocker as InvocationMocker;
-use PHPUnit_Framework_MockObject_Matcher_InvokedCount as InvokedCount;
+use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMocker;
+use PHPUnit\Framework\MockObject\Matcher\InvokedCount as InvokedCount;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Magento\Checkout\Helper\Data;
 use Magento\Quote\Model\Quote;
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php
index cf758553e876d..07dcc65493a85 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php
@@ -73,15 +73,15 @@ protected function setUp()
 
     /**
      * @param bool $hasBackendModel
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsGetBackendModel
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCreate
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsGetValue
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetPath
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetScope
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetScopeId
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetValue
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsAfterLoad
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSerialize
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsGetBackendModel
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCreate
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsGetValue
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetPath
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetScope
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetScopeId
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetValue
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsAfterLoad
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSerialize
      * @param string $expectsValue
      * @param string $className
      * @param string $value
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php
index b779c29c93155..d2a89a8abc7fa 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php
@@ -51,9 +51,9 @@ public function testException()
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $firstExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $firstExpects
      * @param bool $firstResult
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $secondExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $secondExpects
      * @param bool $secondResult
      * @param bool $expectedResult
      * @dataProvider visibilityDataProvider
@@ -74,9 +74,9 @@ public function testDisabled($firstExpects, $firstResult, $secondExpects, $secon
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $firstExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $firstExpects
      * @param bool $firstResult
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $secondExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $secondExpects
      * @param bool $secondResult
      * @param bool $expectedResult
      * @dataProvider visibilityDataProvider
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php
index dd8e8ff38e931..93e691c931603 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php
@@ -98,8 +98,8 @@ protected function setUp()
     /**
      * @param int|null $id
      * @param string $typeId
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectedGetTitle
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectedGetValue
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectedGetTitle
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectedGetValue
      * @return void
      * @dataProvider getLinksTitleDataProvider
      */
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
index 8cad0b9f2dd89..46dda1be365d4 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
@@ -113,18 +113,18 @@ public function testExecuteWhenPersistentIsNotEnabled()
      *
      * @param string $refererUri
      * @param string $requestUri
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expireCounter
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $dispatchCounter
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCustomerIdCounter
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expireCounter
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $dispatchCounter
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCustomerIdCounter
      * @return void
      * @dataProvider requestDataProvider
      */
     public function testExecuteWhenPersistentIsEnabled(
         string $refererUri,
         string $requestUri,
-        \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expireCounter,
-        \PHPUnit_Framework_MockObject_Matcher_InvokedCount $dispatchCounter,
-        \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCustomerIdCounter
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expireCounter,
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $dispatchCounter,
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCustomerIdCounter
     ): void {
         $this->persistentHelperMock
             ->expects($this->once())
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php
index bf58e214ef4a6..3ad9827c7f462 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php
@@ -202,7 +202,7 @@ public function testCheckIsLive()
      * @param int $useAggregatedData
      * @param string $mainTable
      * @param int $isFilter
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getIfNullSqlResult
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getIfNullSqlResult
      * @dataProvider useAggregatedDataDataProvider
      * @return void
      */
@@ -309,7 +309,7 @@ public function testAddItemCountExpr()
      * @param int $isFilter
      * @param int $useAggregatedData
      * @param string $mainTable
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getIfNullSqlResult
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getIfNullSqlResult
      * @dataProvider totalsDataProvider
      * @return void
      */
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php
index 17e13f9d64bd7..df9f0d2139221 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php
@@ -190,8 +190,8 @@ function ($arg) {
     /**
      * @param mixed $from
      * @param mixed $to
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $truncateCount
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $deleteCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $truncateCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $deleteCount
      * @dataProvider intervalsDataProvider
      * @return void
      */
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
index 97dc973e63437..e6f507f87ec3c 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
@@ -157,8 +157,8 @@ public function stepIdentityContainerInit($identityMockClassName)
     }
 
     protected function stepSend(
-        \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendExpects,
-        \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendCopyToExpects
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $sendExpects,
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $sendCopyToExpects
     ) {
         $senderMock = $this->createPartialMock(\Magento\Sales\Model\Order\Email\Sender::class, ['send', 'sendCopyTo']);
         $senderMock->expects($sendExpects)
diff --git a/lib/internal/Magento/Framework/File/Size.php b/lib/internal/Magento/Framework/File/Size.php
index 6f48024f71c16..9817b3b746303 100644
--- a/lib/internal/Magento/Framework/File/Size.php
+++ b/lib/internal/Magento/Framework/File/Size.php
@@ -56,7 +56,7 @@ public function getUploadMaxSize()
      * @param int $mode
      * @return float
      */
-    public function getMaxFileSizeInMb($precision = 0, $mode = PHP_ROUND_HALF_DOWN)
+    public function getMaxFileSizeInMb($precision = 0, $mode = \PHP_ROUND_HALF_DOWN)
     {
         return $this->getFileSizeInMb($this->getMaxFileSize(), $precision, $mode);
     }
@@ -69,7 +69,7 @@ public function getMaxFileSizeInMb($precision = 0, $mode = PHP_ROUND_HALF_DOWN)
      * @param int $mode
      * @return float
      */
-    public function getFileSizeInMb($fileSize, $precision = 0, $mode = PHP_ROUND_HALF_DOWN)
+    public function getFileSizeInMb($fileSize, $precision = 0, $mode = \PHP_ROUND_HALF_DOWN)
     {
         return round($fileSize / (1024 * 1024), $precision, $mode);
     }
diff --git a/lib/internal/Magento/Framework/Filesystem/File/Write.php b/lib/internal/Magento/Framework/Filesystem/File/Write.php
index ea2f3a93d66c0..913421aa91ad2 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/Write.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/Write.php
@@ -103,7 +103,7 @@ public function flush()
      * @param int $lockMode
      * @return bool
      */
-    public function lock($lockMode = LOCK_EX)
+    public function lock($lockMode = \LOCK_EX)
     {
         return $this->driver->fileLock($this->resource, $lockMode);
     }
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php b/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
index 3592c34dae7f6..ecf554de808cc 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
@@ -44,7 +44,7 @@ public function flush();
      * @param int $lockMode
      * @return bool
      */
-    public function lock($lockMode = LOCK_EX);
+    public function lock($lockMode = \LOCK_EX);
 
     /**
      * File unlocking
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php
index 51e86fcf68bee..07dfbacd5d29c 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php
@@ -251,7 +251,7 @@ protected function _getFilesystemMock()
 
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Serialize\Serializer\Json
-     * @throws \PHPUnit_Framework_Exception
+     * @throws \PHPUnit\Framework\Exception
      */
     private function getSerializerMock()
     {
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
index 08d618637db69..f24500c788020 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
@@ -197,9 +197,9 @@ protected function _makeMock($className)
      * @param \PHPUnit_Framework_MockObject_MockObject                       $object
      * @param string                                                        $stubName
      * @param mixed                                                         $return
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount|null        $expects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount|null        $expects
      *
-     * @return \PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     * @return \PHPUnit\Framework\MockObject\Builder\InvocationMocker
      */
     protected function _setStub(
         \PHPUnit_Framework_MockObject_MockObject $object,
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php
index 0dc4d490280ec..3085770980dd3 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php
@@ -40,12 +40,12 @@ public function invokeWithExpectations(
             $expectedParams = $params;
         }
         $builder = $proxiedObject->expects(
-            new \PHPUnit_Framework_MockObject_Matcher_InvokedCount(1)
+            new \PHPUnit\Framework\MockObject\Matcher\InvokedCount(1)
         )->method(
             $expectedMethod
         );
         $builder = call_user_func_array([$builder, 'with'], $expectedParams);
-        $builder->will(new \PHPUnit_Framework_MockObject_Stub_Return($proxiedResult));
+        $builder->will(new \PHPUnit\Framework\MockObject\Stub\ReturnStub($proxiedResult));
 
         return call_user_func_array([$object, $method], $params);
     }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
index a3f34b732be82..70233c0196dc5 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
@@ -220,9 +220,9 @@ public function testToHtmlWhenModuleIsDisabled()
      * @param string|bool $cacheLifetime
      * @param string|bool $dataFromCache
      * @param string $dataForSaveCache
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsDispatchEvent
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCacheLoad
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCacheSave
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsDispatchEvent
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheLoad
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheSave
      * @param string $expectedResult
      * @return void
      * @dataProvider getCacheLifetimeDataProvider
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php
index 703334f896db5..ab623e59d3712 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php
@@ -49,7 +49,7 @@ protected function setUp()
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $loggerExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $loggerExpects
      * @param string $stateMode
      * @return void
      * @dataProvider reorderChildElementLogDataProvider
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
index 4db2da1c1ece9..2a53dbe352cdd 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
@@ -20,10 +20,10 @@ class BlockTest extends \PHPUnit\Framework\TestCase
      * @param array $testArgumentData
      * @param bool $testIsFlag
      * @param bool $isNeedEvaluate
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $addToParentGroupCount
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setTemplateCount
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setTtlCount
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setIsFlag
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $addToParentGroupCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setTemplateCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setTtlCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setIsFlag
      * @dataProvider provider
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
index e69e778c85518..ac1dd43f4dd01 100755
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php
@@ -89,11 +89,11 @@ protected function setUp()
 
     /**
      * @param string $literal
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $scheduleStructureCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $scheduleStructureCount
      * @param string $ifconfigValue
      * @param array $expectedConditions
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getCondition
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCondition
      * @param string $aclKey
      * @param string $aclValue
      *
@@ -238,9 +238,9 @@ public function processBlockDataProvider()
     /**
      * @param string $literal
      * @param string $remove
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getCondition
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCondition
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setRemoveCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setRemoveCondition
      * @dataProvider processReferenceDataProvider
      */
     public function testProcessReference(
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
index e4834accbcc07..1a3b77f1e7899 100755
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
@@ -56,9 +56,9 @@ protected function setUp()
      * @param string $containerName
      * @param array $structureElement
      * @param array $expectedData
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getStructureCondition
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setStructureCondition
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setRemoveCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getStructureCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setStructureCondition
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setRemoveCondition
      *
      * @dataProvider processDataProvider
      */
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
index 6421610c6dbcd..401492a774adc 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
@@ -144,7 +144,7 @@ public function testScheduleNonExistentElement()
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $loggerExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $loggerExpects
      * @param string $stateMode
      * @return void
      * @dataProvider scheduleElementLogDataProvider
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
index 8b6e8d41b5645..d40d65dd2de77 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
@@ -98,8 +98,8 @@ public function testAddUpdate()
      * @param string $headerName
      * @param string $headerValue
      * @param bool $replaceHeader
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setHttpResponseCodeCount
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setHeaderCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setHttpResponseCodeCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setHeaderCount
      * @dataProvider renderResultDataProvider
      */
     public function testRenderResult(
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
index 4f0bf5d8b394c..5f8cd7643e87c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
@@ -69,7 +69,7 @@ public function testCollectEntities()
         );
 
         $this->assertEquals(
-            [\Magento\Eav\Api\Data\AttributeExtensionInterface::class],
+            ['\\' . \Magento\Eav\Api\Data\AttributeExtensionInterface::class],
             $this->_model->collectEntities($this->_testFiles)
         );
     }

From 2482579d2dc137c52b5902fbd20fc088acfb7fc7 Mon Sep 17 00:00:00 2001
From: Michael Wylde <michael.wylde@aligent.com.au>
Date: Tue, 3 Jul 2018 12:24:47 +0930
Subject: [PATCH 102/127] Remove the timezone from the date when retrieving the
 current month from a UTC timestamp.

---
 .../Reports/Model/ResourceModel/Report/Collection.php        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
index d0fed6e1a0654..522bfa7bcf0bf 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php
@@ -215,8 +215,11 @@ protected function _getMonthInterval(\DateTime $dateStart, \DateTime $dateEnd, $
                 )
             );
         } else {
+            // Transform the start date to UTC whilst preserving the date. This is required as getTimestamp()
+            // is in UTC which may result in a different month from the original start date due to time zones.
+            $dateStartUtc = (new \DateTime())->createFromFormat('d-m-Y g:i:s', $dateStart->format('d-m-Y 00:00:00'));
             $interval['end'] = $this->_localeDate->convertConfigTimeToUtc(
-                $dateStart->format('Y-m-' . date('t', $dateStart->getTimestamp()) . ' 23:59:59')
+                $dateStart->format('Y-m-' . date('t', $dateStartUtc->getTimestamp()) . ' 23:59:59')
             );
         }
 

From 393d1f33a36c9641a40a3e583b225738b6f682d0 Mon Sep 17 00:00:00 2001
From: Anshu Mishra <mishra.anshu1710@gmail.com>
Date: Mon, 18 Jun 2018 21:54:59 +0530
Subject: [PATCH 103/127] Admin controller product set save refactor

---
 .../Controller/Adminhtml/Product/Set/Save.php | 49 ++++++++++++++-----
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
index 00a836309e58e..dfddcf7e92b97 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set/Save.php
@@ -6,6 +6,11 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set
 {
     /**
@@ -17,22 +22,49 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Set
      * @var \Magento\Framework\Controller\Result\JsonFactory
      */
     protected $resultJsonFactory;
-
+    
+    /*
+     * @var \Magento\Eav\Model\Entity\Attribute\SetFactory
+     */
+    private $attributeSetFactory;
+    
+    /*
+     * @var \Magento\Framework\Filter\FilterManager
+     */
+    private $filterManager;
+    
+    /*
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+    
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory
+     * @param \Magento\Framework\Filter\FilterManager $filterManager
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Eav\Model\Entity\Attribute\SetFactory $attributeSetFactory = null,
+        \Magento\Framework\Filter\FilterManager $filterManager = null,
+        \Magento\Framework\Json\Helper\Data $jsonHelper = null
     ) {
         parent::__construct($context, $coreRegistry);
         $this->layoutFactory = $layoutFactory;
         $this->resultJsonFactory = $resultJsonFactory;
+        $this->attributeSetFactory =  $attributeSetFactory ?: ObjectManager::getInstance()
+            ->get(\Magento\Eav\Model\Entity\Attribute\SetFactory::class);
+        $this->filterManager =  $filterManager ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Filter\FilterManager::class);
+        $this->jsonHelper =  $jsonHelper ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Json\Helper\Data::class);
     }
 
     /**
@@ -65,16 +97,12 @@ public function execute()
         $isNewSet = $this->getRequest()->getParam('gotoEdit', false) == '1';
 
         /* @var $model \Magento\Eav\Model\Entity\Attribute\Set */
-        $model = $this->_objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class)
-            ->setEntityTypeId($entityTypeId);
-
-        /** @var $filterManager \Magento\Framework\Filter\FilterManager */
-        $filterManager = $this->_objectManager->get(\Magento\Framework\Filter\FilterManager::class);
+        $model = $this->attributeSetFactory->create()->setEntityTypeId($entityTypeId);
 
         try {
             if ($isNewSet) {
                 //filter html tags
-                $name = $filterManager->stripTags($this->getRequest()->getParam('attribute_set_name'));
+                $name = $this->filterManager->stripTags($this->getRequest()->getParam('attribute_set_name'));
                 $model->setAttributeSetName(trim($name));
             } else {
                 if ($attributeSetId) {
@@ -85,11 +113,10 @@ public function execute()
                         __('This attribute set no longer exists.')
                     );
                 }
-                $data = $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)
-                    ->jsonDecode($this->getRequest()->getPost('data'));
+                $data = $this->jsonHelper->jsonDecode($this->getRequest()->getPost('data'));
 
                 //filter html tags
-                $data['attribute_set_name'] = $filterManager->stripTags($data['attribute_set_name']);
+                $data['attribute_set_name'] = $this->filterManager->stripTags($data['attribute_set_name']);
 
                 $model->organizeData($data);
             }

From 7abdafd954d5fb49f06d757d07db3068de85935c Mon Sep 17 00:00:00 2001
From: vitaliyboyko <vitaliyboyko@i.ua>
Date: Tue, 3 Jul 2018 17:38:15 +0300
Subject: [PATCH 104/127] MSI-1411: Add new rule to copy paste detector
 blacklist to avoid cove fixtures on MSI modules

---
 .../Magento/Test/Php/_files/phpcpd/blacklist/common.txt          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index cf0ea458483e8..fd8c09907e0ed 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -201,3 +201,4 @@ IntegrationConfig.php
 setup/performance-toolkit/aggregate-report
 Magento/MessageQueue/Setup
 Magento/Elasticsearch/Elasticsearch5
+Test/_files

From 4aac430f56934211f6397e3be31fe4b9e9992a85 Mon Sep 17 00:00:00 2001
From: Daniel Ruf <daniel.ruf@ueberbit.de>
Date: Mon, 11 Jun 2018 13:08:29 +0200
Subject: [PATCH 105/127] fix: change "My Dashboard" to "My Account"

---
 app/code/Magento/Customer/i18n/en_US.csv                        | 1 -
 .../Customer/view/frontend/layout/customer_account_index.xml    | 2 +-
 .../Test/Constraint/AssertCustomerRedirectToDashboard.php       | 2 +-
 .../Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php     | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index 5d7d8b2bf30a4..61bc5742221a1 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -534,7 +534,6 @@ Addresses,Addresses
 "Account Dashboard","Account Dashboard"
 "Edit Account Information","Edit Account Information"
 "Password forgotten","Password forgotten"
-"My Dashboard","My Dashboard"
 "You are signed out","You are signed out"
 "Associate to Website","Associate to Website"
 "Prefix","Prefix"
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml
index 6384ee9c6562c..4494a5dd67103 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml
@@ -10,7 +10,7 @@
     <body>
         <referenceBlock name="page.main.title">
             <action method="setPageTitle">
-                <argument translate="true" name="title" xsi:type="string">My Dashboard</argument>
+                <argument translate="true" name="title" xsi:type="string">My Account</argument>
             </action>
         </referenceBlock>
         <referenceContainer name="content">
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
index da8f49485d634..61e42e3dd60c5 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php
@@ -17,7 +17,7 @@ class AssertCustomerRedirectToDashboard extends AbstractConstraint
     /**
      * Dashboard Message on account index page.
      */
-    const DASHBOARD_MESSAGE = 'My Dashboard';
+    const DASHBOARD_MESSAGE = 'My Account';
 
     /**
      * Constraint severeness
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
index 02a439deb856b..22cd5bd13e94c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php
@@ -49,7 +49,7 @@ public function run()
     {
         $this->customerAccount->open();
         $this->cmsIndex->getCmsPageBlock()->waitPageInit();
-        if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Dashboard') {
+        if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Account') {
             $this->cmsIndex->getLinksBlock()->openLink('Sign Out');
             $this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page');
             $this->cmsIndex->getCmsPageBlock()->waitPageInit();

From 9f14c7d53cbf365bcd12e74d70397fba8cf01ad2 Mon Sep 17 00:00:00 2001
From: Daniel Ruf <daniel.ruf@ueberbit.de>
Date: Mon, 2 Jul 2018 10:34:12 +0200
Subject: [PATCH 106/127] fix: change "Account Dashboard" to "My Account"

---
 app/code/Magento/Customer/etc/frontend/page_types.xml         | 2 +-
 app/code/Magento/Customer/i18n/en_US.csv                      | 1 -
 .../Customer/view/frontend/layout/customer_account.xml        | 2 +-
 app/design/frontend/Magento/blank/i18n/en_US.csv              | 1 -
 .../Magento/luma/Magento_Customer/layout/customer_account.xml | 4 ++--
 app/design/frontend/Magento/luma/i18n/en_US.csv               | 1 -
 .../Test/Constraint/AssertCustomerDefaultAddresses.php        | 2 +-
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Customer/etc/frontend/page_types.xml b/app/code/Magento/Customer/etc/frontend/page_types.xml
index 2c0feeac532a1..a49d735b4467e 100644
--- a/app/code/Magento/Customer/etc/frontend/page_types.xml
+++ b/app/code/Magento/Customer/etc/frontend/page_types.xml
@@ -11,7 +11,7 @@
     <type id="customer_account_createpassword" label="Reset a Password"/>
     <type id="customer_account_edit" label="Customer Account Edit Form"/>
     <type id="customer_account_forgotpassword" label="Customer Forgot Password Form"/>
-    <type id="customer_account_index" label="Customer My Account Dashboard"/>
+    <type id="customer_account_index" label="Customer My Account"/>
     <type id="customer_account_login" label="Customer Account Login Form"/>
     <type id="customer_account_logoutsuccess" label="Customer Account Logout Success"/>
     <type id="customer_address_form" label="Customer My Account Address Edit Form"/>
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index 61bc5742221a1..bf73d6361d4c7 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -531,7 +531,6 @@ Type,Type
 "Send Welcome Email From","Send Welcome Email From"
 "Are you sure you want to delete this item?","Are you sure you want to delete this item?"
 Addresses,Addresses
-"Account Dashboard","Account Dashboard"
 "Edit Account Information","Edit Account Information"
 "Password forgotten","Password forgotten"
 "You are signed out","You are signed out"
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
index 4224e84972f88..a2a15a4166b73 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -22,7 +22,7 @@
                     </arguments>
                     <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-link">
                         <arguments>
-                            <argument name="label" xsi:type="string" translate="true">Account Dashboard</argument>
+                            <argument name="label" xsi:type="string" translate="true">My Account</argument>
                             <argument name="path" xsi:type="string">customer/account</argument>
                             <argument name="sortOrder" xsi:type="number">250</argument>
                         </arguments>
diff --git a/app/design/frontend/Magento/blank/i18n/en_US.csv b/app/design/frontend/Magento/blank/i18n/en_US.csv
index b9a1d343b7f2d..a491a567a3777 100644
--- a/app/design/frontend/Magento/blank/i18n/en_US.csv
+++ b/app/design/frontend/Magento/blank/i18n/en_US.csv
@@ -1,5 +1,4 @@
 Summary,Summary
-"Account Dashboard","Account Dashboard"
 "Account Information","Account Information"
 "Address Book","Address Book"
 Menu,Menu
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
index c193be0884449..5ef5dcac1131d 100644
--- a/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
+++ b/app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml
@@ -10,7 +10,7 @@
         <referenceContainer name="sidebar.main">
             <block class="Magento\Framework\View\Element\Template" name="customer_account_navigation_block" template="Magento_Theme::html/collapsible.phtml" before="-">
                 <arguments>
-                    <argument name="block_title" translate="true" xsi:type="string">Account Dashboard</argument>
+                    <argument name="block_title" translate="true" xsi:type="string">My Account</argument>
                     <argument name="block_css" xsi:type="string">block-collapsible-nav</argument>
                 </arguments>
                 <block class="Magento\Customer\Block\Account\Navigation" name="customer_account_navigation" before="-">
@@ -19,7 +19,7 @@
                     </arguments>
                     <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-link">
                         <arguments>
-                            <argument name="label" xsi:type="string" translate="true">Account Dashboard</argument>
+                            <argument name="label" xsi:type="string" translate="true">My Account</argument>
                             <argument name="path" xsi:type="string">customer/account</argument>
                             <argument name="sortOrder" xsi:type="number">250</argument>
                         </arguments>
diff --git a/app/design/frontend/Magento/luma/i18n/en_US.csv b/app/design/frontend/Magento/luma/i18n/en_US.csv
index 66f5d51218d73..7bf9e0afaf015 100644
--- a/app/design/frontend/Magento/luma/i18n/en_US.csv
+++ b/app/design/frontend/Magento/luma/i18n/en_US.csv
@@ -52,6 +52,5 @@ Footer,Footer
 "Your shipping confirmation is below. Thank you again for your business.","Your shipping confirmation is below. Thank you again for your business."
 "Your Shipment #%shipment_id for Order #%order_id","Your Shipment #%shipment_id for Order #%order_id"
 "Update to your %store_name shipment","Update to your %store_name shipment"
-"Account Dashboard","Account Dashboard"
 "Address Book","Address Book"
 "Account Information","Account Information"
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
index b5e1e5b5e98d7..3768bab85a33a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
@@ -24,7 +24,7 @@ class AssertCustomerDefaultAddresses extends AbstractConstraint
      */
     public function processAssert(CustomerAccountIndex $customerAccountIndex, Address $address)
     {
-        $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Account Dashboard');
+        $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Account');
         sleep(6);
         $defaultBillingAddress = explode(
             "\n",

From 386438dcec0f260fb7135332bbb6eb5f03190d6c Mon Sep 17 00:00:00 2001
From: hitesh-wagento <hitesh@wagento.com>
Date: Wed, 4 Jul 2018 12:53:15 +0530
Subject: [PATCH 107/127] [Changed password placeholder text in checkout page]

---
 app/code/Magento/Checkout/i18n/en_US.csv                        | 2 +-
 .../Checkout/view/frontend/web/template/form/element/email.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
index 8d297c4060abd..53fdebb8a2995 100644
--- a/app/code/Magento/Checkout/i18n/en_US.csv
+++ b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -176,4 +176,4 @@ Payment,Payment
 "Not yet calculated","Not yet calculated"
 "We received your order!","We received your order!"
 "Thank you for your purchase!","Thank you for your purchase!"
-"optional", "optional"
+"Password", "Password"
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
index 0dee6cb0708e6..bb68e24835b67 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
@@ -41,7 +41,7 @@
                     <input class="input-text"
                            data-bind="
                                 attr: {
-                                    placeholder: $t('optional'),
+                                    placeholder: $t('Password'),
                                 }"
                            type="password"
                            name="password"

From f83d14ad3e15a823f64a31e7eb0d8710e4be9a17 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Wed, 4 Jul 2018 11:22:29 +0300
Subject: [PATCH 108/127] MAGETWO-88645: Error while deleting a Product Image

---
 .../Model/Product/Gallery/UpdateHandlerTest.php    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
index 81207e9388021..bed17b6bdb935 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
@@ -36,7 +36,7 @@ class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
     /**
      * @var WriteInterface
      */
-    private $rootDirectory;
+    private $mediaDirectory;
 
     /**
      * @var Filesystem
@@ -53,13 +53,13 @@ class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->fileName = 'test.txt';
+        $this->fileName = 'image.txt';
 
         $this->objectManager = Bootstrap::getObjectManager();
         $this->updateHandler = $this->objectManager->create(UpdateHandler::class);
         $this->filesystem = $this->objectManager->get(Filesystem::class);
-        $this->rootDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::ROOT);
-        $this->rootDirectory->writeFile($this->rootDirectory->getAbsolutePath($this->fileName), 'Test');
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->mediaDirectory->writeFile($this->mediaDirectory->getRelativePath($this->fileName), 'Test');
     }
 
     /**
@@ -67,7 +67,7 @@ protected function setUp()
      */
     public function testExecuteWithIllegalFilename(): void
     {
-        $filePath = str_repeat('/..', 9) . '/' . $this->fileName;
+        $filePath = str_repeat('/..', 2) . DIRECTORY_SEPARATOR . $this->fileName;
 
         /** @var $product Product */
         $product = Bootstrap::getObjectManager()->create(Product::class);
@@ -87,7 +87,7 @@ public function testExecuteWithIllegalFilename(): void
         );
 
         $this->updateHandler->execute($product);
-        $this->assertFileExists($this->rootDirectory->getAbsolutePath($this->fileName));
+        $this->assertFileExists($this->mediaDirectory->getAbsolutePath($this->fileName));
     }
 
     /**
@@ -95,6 +95,6 @@ public function testExecuteWithIllegalFilename(): void
      */
     protected function tearDown(): void
     {
-        $this->rootDirectory->getDriver()->deleteFile($this->rootDirectory->getAbsolutePath($this->fileName));
+        $this->mediaDirectory->getDriver()->deleteFile($this->mediaDirectory->getAbsolutePath($this->fileName));
     }
 }

From 6feedba9e04c3bf28a68f3bcd26717fcf1301d6e Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Wed, 4 Jul 2018 11:32:41 +0300
Subject: [PATCH 109/127] MAGETWO-88645: Error while deleting a Product Image

---
 .../Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
index bed17b6bdb935..559dd6d1b747d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
@@ -59,7 +59,7 @@ protected function setUp()
         $this->updateHandler = $this->objectManager->create(UpdateHandler::class);
         $this->filesystem = $this->objectManager->get(Filesystem::class);
         $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-        $this->mediaDirectory->writeFile($this->mediaDirectory->getRelativePath($this->fileName), 'Test');
+        $this->mediaDirectory->writeFile($this->fileName, 'Test');
     }
 
     /**

From 0c3e7f28c299fb0c7bb6d35d1f00118a00398b81 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Wed, 4 Jul 2018 12:13:20 +0300
Subject: [PATCH 110/127] ENGCOM-2130: [Forwardport] Fixes updating wishlist
 item if an item object is passed instead its id. #16391

---
 app/code/Magento/Wishlist/Model/Wishlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index d6284f32c4f5e..ec0021c4949ea 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -217,7 +217,7 @@ public function loadByCustomerId($customerId, $create = false)
     public function getName()
     {
         $name = $this->_getData('name');
-        if (!strlen($name)) {
+        if ($name === null || !strlen($name)) {
             return $this->_wishlistData->getDefaultWishlistName();
         }
         return $name;

From c6cc9810f9aed7a00f7c04295f5d3942357ff71f Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Wed, 4 Jul 2018 12:13:43 +0300
Subject: [PATCH 111/127] ENGCOM-2152: [Forwardport] Move breadcrumb json
 configuration to viewmodel #16466

---
 .../Catalog/ViewModel/Product/Breadcrumbs.php | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
index 871d21d8ee8d3..01c286cdc74ce 100644
--- a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
@@ -13,6 +13,7 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Framework\Escaper;
 
 /**
  * Product breadcrumbs view model.
@@ -36,21 +37,29 @@ class Breadcrumbs extends DataObject implements ArgumentInterface
      */
     private $json;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * @param Data $catalogData
      * @param ScopeConfigInterface $scopeConfig
-     * @param Json $json
+     * @param Json|null $json
+     * @param Escaper|null $escaper
      */
     public function __construct(
         Data $catalogData,
         ScopeConfigInterface $scopeConfig,
-        Json $json = null
+        Json $json = null,
+        Escaper $escaper = null
     ) {
         parent::__construct();
 
         $this->catalogData = $catalogData;
         $this->scopeConfig = $scopeConfig;
         $this->json = $json ?: ObjectManager::getInstance()->get(Json::class);
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
     }
 
     /**
@@ -98,12 +107,14 @@ public function getProductName(): string
      */
     public function getJsonConfiguration()
     {
-        return $this->json->serialize([
-            'breadcrumbs' => [
-                'categoryUrlSuffix' => $this->getCategoryUrlSuffix(),
-                'userCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
-                'product' => $this->getProductName()
+        return $this->json->serialize(
+            [
+                'breadcrumbs' => [
+                    'categoryUrlSuffix' => $this->escaper->escapeHtml($this->getCategoryUrlSuffix()),
+                    'userCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
+                    'product' => $this->escaper->escapeHtml($this->escaper->escapeJs($this->getProductName()))
+                ]
             ]
-        ]);
+        );
     }
 }

From 3a2ae7f149eaf0d4b5131117c1a80b02b100d620 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Wed, 4 Jul 2018 12:22:00 +0300
Subject: [PATCH 112/127] ENGCOM-1806: [Forwardport] Resolve Knockout
 non-unique elements id in console error #15732

---
 .../view/frontend/web/template/billing-address/form.html       | 3 ++-
 .../FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
index 1568045d4a98e..086cca814bec1 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
@@ -9,7 +9,8 @@
     <!-- ko template: getTemplate() --><!-- /ko -->
     <!--/ko-->
     <form data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
-        <fieldset data-bind="attr: { id:'billing-new-address-form-'+index, value:index}" class="fieldset address">
+        <fieldset data-bind="attr: { id:'billing-new-address-form-'+index, value:index}"
+                  class="billing-new-address-form fieldset address">
             <!-- ko foreach: getRegion('additional-fieldsets') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
index 3d1e9f24b8d9a..064e7bbdd9122 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
@@ -12,7 +12,7 @@
         <element name="isPaymentSection" type="text" selector="//*[@class='opc-progress-bar']/li[contains(@class, '_active') and span[contains(.,'Review &amp; Payments')]]"/>
         <element name="availablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div:nth-child(2)>div.payment-method-title.field.choice"/>
         <element name="notAvailablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div.payment-method._active>div.payment-method-title.field.choice"/>
-        <element name="billingNewAddressForm" type="text" selector="#billing-new-address-form"/>
+        <element name="billingNewAddressForm" type="text" selector=".billing-new-address-form"/>
         <element name="placeOrderDisabled" type="button" selector="#checkout-payment-method-load button.disabled"/>
         <element name="update" type="button" selector=".payment-method-billing-address .action.action-update"/>
         <element name="guestFirstName" type="input" selector=".billing-address-form input[name*='firstname']"/>

From 77bb78ef140ce819ec97a3428f1ff8f1e7e831bd Mon Sep 17 00:00:00 2001
From: vshvorak <gvasyamail@gmail.com>
Date: Wed, 4 Jul 2018 13:04:58 +0300
Subject: [PATCH 113/127] Fixed _module.less file according Magento 2 LESS
 coding standard

---
 .../web/css/source/_module.less               | 117 +++++++++---------
 1 file changed, 58 insertions(+), 59 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
index 111d4d57d6212..0716137ed1bbd 100644
--- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
@@ -38,7 +38,7 @@
 
 //  Image and Color swatch
 @img-color-swatch-option__hover__border: @swatch-option__hover__border;
-@img-color-swatch-option__hover__outline: 2px solid #ee0000;
+@img-color-swatch-option__hover__outline: 2px solid #e00;
 
 //  Tooltip
 @swatch-option-tooltip__background: @color-white;
@@ -53,14 +53,14 @@
 
 @swatch-option-tooltip-layered-title__color: @swatch-option-tooltip-title__color;
 
-// Layered Features
+//  Layered Features
 @swatch-option-link-layered__focus__box-shadow: 0 0 3px 1px @color-sky-blue1;
 
 //
 //  Common
 //  _____________________________________________
 
- & when (@media-common = true) {
+& when (@media-common = true) {
 
     .swatch {
         &-attribute {
@@ -72,14 +72,14 @@
                     padding-right: @indent__s;
                 }
 
-                &[data-required="1"]:after {
+                &[data-required='1']:after {
                     .lib-css(color, @form-field-label-asterisk__color);
                     content: '*';
+                    font-size: @font-size__base;
+                    font-weight: @font-weight__bold;
                     position: absolute;
                     right: -11px;
                     top: -2px;
-                    font-weight: @font-weight__bold;
-                    font-size: @font-size__base;
                 }
             }
 
@@ -120,16 +120,16 @@
 
         &-option {
             .lib-css(border, @swatch-option__border);
-            padding: 1px 2px;
-            min-width: 30px;
-            max-width: 90px;
-            height: 20px;
+            cursor: pointer;
             float: left;
+            height: 20px;
             margin: 0 @indent__s @indent__xs 0;
-            text-align: center;
-            cursor: pointer;
-            position: relative;
+            max-width: 90px;
+            min-width: 30px;
             overflow: hidden;
+            padding: 1px 2px;
+            position: relative;
+            text-align: center;
             text-overflow: ellipsis;
 
             &.text {
@@ -171,38 +171,37 @@
                 cursor: default;
 
                 &:after {
+                    //  ToDo: improve .lib-background-gradient() to support diagonal gradient
+                    background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: -o-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(42%, rgba(255, 255, 255, 0)), color-stop(43%, rgba(255, 255, 255, 1)), color-stop(46%, rgba(255, 255, 255, 1)), color-stop(47%, rgba(255, 82, 22, 1)), color-stop(53%, rgba(255, 82, 22, 1)), color-stop(54%, rgba(255, 255, 255, 1)), color-stop(57%, rgba(255, 255, 255, 1)), color-stop(58%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 0)));
+                    background: -webkit-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
+                    bottom: 0;
                     content: '';
-                    position: absolute;
+                    filter: 'progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff, endColorstr=#00ffffff, GradientType=1)';
                     left: 0;
+                    position: absolute;
                     right: 0;
                     top: 0;
-                    bottom: 0;
-
-                    // ToDo: improve .lib-background-gradient() to support diagonal gradient
-                    background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-                    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(42%, rgba(255, 255, 255, 0)), color-stop(43%, rgba(255, 255, 255, 1)), color-stop(46%, rgba(255, 255, 255, 1)), color-stop(47%, rgba(255, 82, 22, 1)), color-stop(53%, rgba(255, 82, 22, 1)), color-stop(54%, rgba(255, 255, 255, 1)), color-stop(57%, rgba(255, 255, 255, 1)), color-stop(58%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 0)));
-                    background: -webkit-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-                    background: -o-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-                    background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-                    background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
-                    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00ffffff', endColorstr='#00ffffff', GradientType=1);
                 }
             }
             &-disabled {
-                outline: none !important;
-                cursor: default;
                 border: 0;
+                cursor: default;
+                outline: none !important;
 
                 &:after {
-                    .lib-css(background, @swatch-option__disabled__background);
                     .lib-rotate(-30deg);
                     content: '';
+                    height: 2px;
+                    left: -4px;
                     position: absolute;
+                    top: 10px;
                     width: 42px;
-                    height: 2px;
                     z-index: 995;
-                    left: -4px;
-                    top: 10px;  
+                    .lib-css(background, @swatch-option__disabled__background);
                 }
             }
 
@@ -211,86 +210,86 @@
             }
 
             &-tooltip {
-                .lib-css(background, @swatch-option-tooltip__background);
                 .lib-css(border, @swatch-option-tooltip__border);
                 .lib-css(color, @swatch-option-tooltip__color);
-                max-width: 140px;
+                display: none;
                 max-height: 100%;
+                max-width: 140px;
                 min-height: 20px;
                 min-width: 20px;
-                position: absolute;
                 padding: @indent__xs;
-                display: none;
-                z-index: 999;
+                position: absolute;
                 text-align: center;
+                z-index: 999;
+                .lib-css(background, @swatch-option-tooltip__background);
 
                 &,
-                &-layered  {
+                &-layered {
                     .corner {
-                        left: 40%;
-                        position: absolute;
                         bottom: 0;
                         height: 8px;
+                        left: 40%;
+                        position: absolute;
 
                         &:before,
                         &:after {
+                            border-style: solid;
                             content: '';
+                            font-size: 1px;
+                            height: 0;
                             position: relative;
                             width: 0;
-                            height: 0;
-                            border-style: solid;
-                            font-size: 1px;
                         }
 
                         &:before {
-                            top: 2px;
-                            left: 0;
+                            border-color: @color-gray68 transparent transparent transparent;
                             border-width: 8px 8.5px 0 8.5px;
-                            border-color: #adadad transparent transparent transparent;
+                            left: 0;
+                            top: 2px;
                         }
 
                         &:after {
-                            top: 1px;
-                            left: -15px;
+                            border-color: @primary4 transparent transparent transparent;
                             border-width: 7px 7.5px 0 7.5px;
-                            border-color: #fff transparent transparent transparent;
+                            left: -15px;
+                            top: 1px;
                         }
                     }
 
                     .image {
                         display: block;
                         height: 130px;
-                        width: 130px;
                         margin: 0 auto;
+                        width: 130px;
                     }
                 }
 
                 &-layered {
-                    .lib-css(background, @swatch-option-tooltip-layered__background);
                     .lib-css(border, @swatch-option-tooltip-layered__border);
                     .lib-css(color, @swatch-option-tooltip-layered__color);
-                    width: 140px;
-                    position: absolute;
+                    .lib-css(background, @swatch-option-tooltip-layered__background);
                     display: none;
-                    z-index: 999;
                     left: -47px;
+                    position: absolute;
+                    width: 140px;
+                    z-index: 999;
                 }
 
                 .title {
                     .lib-css(color, @swatch-option-tooltip-title__color);
+                    display: block;
+                    max-height: 200px;
                     max-width: 140px;
                     min-height: 20px;
-                    max-height: 200px;
-                    text-align: center;
-                    display: block;
                     overflow: hidden;
+                    text-align: center;
                 }
             }
 
             &-link-layered {
-                position: relative;
                 margin: 0 !important;
                 padding: 0 !important;
+                position: relative;
 
                 &:focus > div {
                     .lib-css(box-shadow, @swatch-option-link-layered__focus__box-shadow);
@@ -313,8 +312,8 @@
         &-more {
             display: inline-block;
             margin: 2px 0;
-            text-decoration: none !important;
             position: static;
+            text-decoration: none !important;
             z-index: 1;
         }
 
@@ -336,10 +335,10 @@
     }
 
     .clearfix:after {
+        clear: both;
         content: '';
-        visibility: hidden;
         display: block;
         height: 0;
-        clear: both;
+        visibility: hidden;
     }
 }

From 4cb997aea6f7c4cf38a25d20ea0ec4dbd6b7f5ad Mon Sep 17 00:00:00 2001
From: vgelani <vishalgelani99@gmail.com>
Date: Wed, 4 Jul 2018 19:06:19 +0530
Subject: [PATCH 114/127] Fixed add to wishlist issue on product price 0

---
 app/code/Magento/Catalog/Pricing/Price/RegularPrice.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
index 609255d852da3..1397ceb6bf71c 100644
--- a/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/RegularPrice.php
@@ -22,14 +22,14 @@ class RegularPrice extends AbstractPrice implements BasePriceProviderInterface
     /**
      * Get price value
      *
-     * @return float|bool
+     * @return float
      */
     public function getValue()
     {
         if ($this->value === null) {
             $price = $this->product->getPrice();
             $priceInCurrentCurrency = $this->priceCurrency->convertAndRound($price);
-            $this->value = $priceInCurrentCurrency ? floatval($priceInCurrentCurrency) : false;
+            $this->value = $priceInCurrentCurrency ? floatval($priceInCurrentCurrency) : 0;
         }
         return $this->value;
     }

From 988ef8956d03341280f3599ffb3bb5049cd4af56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karla=20Saarem=C3=A4e?= <karlasaaremae@gmail.com>
Date: Wed, 4 Jul 2018 16:52:25 +0300
Subject: [PATCH 115/127] added new phrase

---
 app/code/Magento/Swatches/i18n/en_US.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Swatches/i18n/en_US.csv b/app/code/Magento/Swatches/i18n/en_US.csv
index 8954bdb9228e5..9fe2ec7067570 100644
--- a/app/code/Magento/Swatches/i18n/en_US.csv
+++ b/app/code/Magento/Swatches/i18n/en_US.csv
@@ -41,3 +41,4 @@ Admin,Admin
 "The value of Admin must be unique.","The value of Admin must be unique."
 "The value of Admin must be unique. (%1)","The value of Admin must be unique. (%1)"
 Description,Description
+More,More

From ede97e4613ba491e15fbaa409d4a10623b9eb5f3 Mon Sep 17 00:00:00 2001
From: Erik Hansen <erikpallhansen@gmail.com>
Date: Mon, 2 Jul 2018 12:34:11 -0500
Subject: [PATCH 116/127] Properly hyphenate "third-party"

---
 app/code/Magento/Backend/etc/adminhtml/system.xml           | 2 +-
 app/code/Magento/Backend/i18n/en_US.csv                     | 6 +++---
 .../view/adminhtml/ui_component/design_config_form.xml      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 86a2f3b772d2a..be1b836d64802 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -432,7 +432,7 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Store</backend_model>
                     <comment>
-                        <![CDATA[<strong style="color:red">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).]]>
+                        <![CDATA[<strong style="color:red">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).]]>
                     </comment>
                 </field>
                 <field id="redirect_to_base" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
index f9f44f547e25b..bfedd56b14313 100644
--- a/app/code/Magento/Backend/i18n/en_US.csv
+++ b/app/code/Magento/Backend/i18n/en_US.csv
@@ -405,9 +405,9 @@ Web,Web
 "Url Options","Url Options"
 "Add Store Code to Urls","Add Store Code to Urls"
 "
-                        <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+                        <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).
                     ","
-                        <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).
+                        <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).
                     "
 "Auto-redirect to Base URL","Auto-redirect to Base URL"
 "Search Engine Optimization","Search Engine Optimization"
@@ -447,7 +447,7 @@ Tags,Tags
 "<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>","<h1 class=""page-heading"">404 Error</h1><p>Page not found.</p>"
 "Community Edition","Community Edition"
 "Default Theme","Default Theme"
-"If no value is specified, the system default is used. The system default may be modified by third party extensions.","If no value is specified, the system default is used. The system default may be modified by third party extensions."
+"If no value is specified, the system default is used. The system default may be modified by third-party extensions.","If no value is specified, the system default is used. The system default may be modified by third-party extensions."
 "Applied Theme","Applied Theme"
 "Design Rule","Design Rule"
 "User Agent Rules","User Agent Rules"
diff --git a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml
index 19a4ab1388006..46902363f1fd7 100644
--- a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml
+++ b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml
@@ -12,7 +12,7 @@
         </settings>
         <field name="theme_theme_id" sortOrder="10" formElement="select">
             <settings>
-                <notice translate="true">If no value is specified, the system default is used. The system default may be modified by third party extensions.</notice>
+                <notice translate="true">If no value is specified, the system default is used. The system default may be modified by third-party extensions.</notice>
                 <dataType>text</dataType>
                 <label translate="true">Applied Theme</label>
                 <dataScope>theme_theme_id</dataScope>

From 874fb22c9c292183d0b5cf2d65cf00a60bba511d Mon Sep 17 00:00:00 2001
From: Nadiya Syvokonenko <nsyvokonenko@magento.com>
Date: Thu, 5 Jul 2018 13:09:56 +0300
Subject: [PATCH 117/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions  - revert EntityAbstract class and add
 error message to class generator

---
 .../Magento/Framework/Code/GeneratorTest.php  |  12 +--
 .../Magento/Framework/Code/Generator.php      |   7 +-
 .../Code/Generator/EntityAbstract.php         |  42 +++-----
 .../Unit/Generator/EntityAbstractTest.php     | 101 +++++-------------
 .../Code/Test/Unit/GeneratorTest.php          |  24 +++--
 5 files changed, 72 insertions(+), 114 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
index 4c0d14a960c51..a43013860c79c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
@@ -173,18 +173,18 @@ public function testGenerateClassExtensionAttributesInterfaceFactoryWithNamespac
     }
 
     /**
-     * It tries to generate a new class file if the generated directory is read-only
+     * It tries to generate a new class file when the generated directory is read-only
      */
     public function testGeneratorClassWithErrorSaveClassFile()
     {
-        $msgPart = 'Error: an object of a generated class may be a dependency for another object, '
-            . 'but this dependency has not been defined or set correctly in the signature of the related construct '
-            . 'method';
+        $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'Factory';
+        $msgPart = 'Class ' . $factoryClassName . ' generation error: The requested class did not generate properly, '
+            . 'because the \'generated\' directory permission is read-only.';
+        $regexpMsgPart = preg_quote($msgPart);
         $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessageRegExp("/.*$msgPart.*/");
+        $this->expectExceptionMessageRegExp("/.*$regexpMsgPart.*/");
         $this->generatedDirectory->create($this->testRelativePath);
         $this->generatedDirectory->changePermissionsRecursively($this->testRelativePath, 0555, 0444);
-        $factoryClassName = self::CLASS_NAME_WITH_NAMESPACE . 'Factory';
         $generatorResult = $this->_generator->generateClass($factoryClassName);
         $this->assertFalse($generatorResult);
         $pathToSystemLog = $this->logDirectory->getAbsolutePath('system.log');
diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index fb20279176ea7..0d1011587dc86 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -116,7 +116,12 @@ public function generateClass($className)
                 /** @var $logger LoggerInterface */
                 $logger = $this->getObjectManager()->get(LoggerInterface::class);
                 $errors = $generator->getErrors();
-                $message = implode(PHP_EOL, $errors) . ' in [' . $className . ']';
+                $errors[] = 'Class ' . $className . ' generation error: The requested class did not generate properly, '
+                    . 'because the \'generated\' directory permission is read-only. '
+                    . 'If --- after running the \'bin/magento setup:di:compile\' CLI command when the \'generated\' '
+                    . 'directory permission is set to write --- the requested class did not generate properly, then '
+                    . 'you must add the generated class object to the signature of the related construct method, only.';
+                $message = implode(PHP_EOL, $errors);
                 $logger->critical($message);
                 throw new \RuntimeException($message);
             }
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index ae120363f8e52..3efe110ccf193 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -5,10 +5,7 @@
  */
 namespace Magento\Framework\Code\Generator;
 
-use Magento\Framework\Exception\FileSystemException;
 use Zend\Code\Generator\ValueGenerator;
-use Magento\Framework\Filesystem\Driver\File;
-use Magento\Framework\ObjectManagerInterface;
 
 abstract class EntityAbstract
 {
@@ -44,7 +41,7 @@ abstract class EntityAbstract
     /**
      * Class generator object
      *
-     * @var CodeGeneratorInterface
+     * @var \Magento\Framework\Code\Generator\CodeGeneratorInterface
      */
     protected $_classGenerator;
 
@@ -57,20 +54,20 @@ abstract class EntityAbstract
      * @param null|string $sourceClassName
      * @param null|string $resultClassName
      * @param Io $ioObject
-     * @param CodeGeneratorInterface $classGenerator
+     * @param \Magento\Framework\Code\Generator\CodeGeneratorInterface $classGenerator
      * @param DefinedClasses $definedClasses
      */
     public function __construct(
         $sourceClassName = null,
         $resultClassName = null,
         Io $ioObject = null,
-        CodeGeneratorInterface $classGenerator = null,
+        \Magento\Framework\Code\Generator\CodeGeneratorInterface $classGenerator = null,
         DefinedClasses $definedClasses = null
     ) {
         if ($ioObject) {
             $this->_ioObject = $ioObject;
         } else {
-            $this->_ioObject = new Io(new File());
+            $this->_ioObject = new Io(new \Magento\Framework\Filesystem\Driver\File());
         }
         if ($classGenerator) {
             $this->_classGenerator = $classGenerator;
@@ -109,17 +106,6 @@ public function generate()
                     $this->_addError('Can\'t generate source code.');
                 }
             }
-        } catch (FileSystemException $e) {
-            $message = 'Error: an object of a generated class may be a dependency for another object, but this '
-                . 'dependency has not been defined or set correctly in the signature of the related construct method. '
-                . 'Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento '
-                . 'deploy:mode:set production` does not create the required generated classes. '
-                . 'Magento cannot write a class file to the "generated" directory that is read-only. Before using the '
-                . 'read-only file system, the classes to be generated must be created beforehand in the "generated" '
-                . 'directory. For details, see the "File systems access permissions" topic '
-                . 'at http://devdocs.magento.com.';
-            $this->_addError($message);
-            $this->_addError($e->getMessage());
         } catch (\Exception $e) {
             $this->_addError($e->getMessage());
         }
@@ -203,7 +189,7 @@ protected function _getClassProperties()
             'visibility' => 'protected',
             'docblock' => [
                 'shortDescription' => 'Object Manager instance',
-                'tags' => [['name' => 'var', 'description' => '\\' . ObjectManagerInterface::class]],
+                'tags' => [['name' => 'var', 'description' => '\\' . \Magento\Framework\ObjectManagerInterface::class]],
             ],
         ];
 
@@ -264,9 +250,9 @@ protected function _validateData()
             $this->_addError('Source class ' . $sourceClassName . ' doesn\'t exist.');
             return false;
         } elseif (/**
-         * If makeResultFileDirectory only fails because the file is already created,
-         * a competing process has generated the file, no exception should be thrown.
-         */
+             * If makeResultFileDirectory only fails because the file is already created,
+             * a competing process has generated the file, no exception should be thrown.
+             */
             !$this->_ioObject->makeResultFileDirectory($resultClassName)
             && !$this->_ioObject->fileExists($resultDir)
         ) {
@@ -323,8 +309,9 @@ protected function _getNullDefaultValue()
      *
      * @return null|string
      */
-    private function extractParameterType(\ReflectionParameter $parameter): ?string
-    {
+    private function extractParameterType(
+        \ReflectionParameter $parameter
+    ): ?string {
         /** @var string|null $typeName */
         $typeName = null;
         if ($parameter->hasType()) {
@@ -341,7 +328,7 @@ private function extractParameterType(\ReflectionParameter $parameter): ?string
             }
 
             if ($parameter->allowsNull()) {
-                $typeName = '?' . $typeName;
+                $typeName = '?' .$typeName;
             }
         }
 
@@ -353,8 +340,9 @@ private function extractParameterType(\ReflectionParameter $parameter): ?string
      *
      * @return null|ValueGenerator
      */
-    private function extractParameterDefaultValue(\ReflectionParameter $parameter): ?ValueGenerator
-    {
+    private function extractParameterDefaultValue(
+        \ReflectionParameter $parameter
+    ): ?ValueGenerator {
         /** @var ValueGenerator|null $value */
         $value = null;
         if ($parameter->isOptional() && $parameter->isDefaultValueAvailable()) {
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
index 220e13b6d02c9..afd784b061a22 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php
@@ -5,18 +5,7 @@
  */
 namespace Magento\Framework\Code\Test\Unit\Generator;
 
-use Magento\Framework\Exception\FileSystemException;
-use Magento\Framework\Phrase;
-use Magento\Framework\DataObject;
-use Magento\Framework\DataObject_MyResult;
-use PHPUnit\Framework\TestCase;
-use Magento\Framework\Code\Generator\EntityAbstract;
-use Magento\Framework\Code\Generator\Io;
-use Magento\Framework\Code\Generator\ClassGenerator;
-use Magento\Framework\Code\Generator\DefinedClasses;
-use \PHPUnit_Framework_MockObject_MockObject as Mock;
-
-class EntityAbstractTest extends TestCase
+class EntityAbstractTest extends \PHPUnit\Framework\TestCase
 {
     /**#@+
      * Source and result class parameters
@@ -44,7 +33,7 @@ class EntityAbstractTest extends TestCase
     /**
      * Model under test
      *
-     * @var EntityAbstract|Mock
+     * @var \Magento\Framework\Code\Generator\EntityAbstract| \PHPUnit_Framework_MockObject_MockObject
      */
     protected $_model;
 
@@ -60,9 +49,9 @@ class EntityAbstractTest extends TestCase
 
     protected function setUp()
     {
-        $this->sourceClass = '\\' . DataObject::class;
-        $this->resultClass = '\\' . DataObject_MyResult::class;
-        $this->_model = $this->getMockForAbstractClass(EntityAbstract::class);
+        $this->sourceClass = '\\' . \Magento\Framework\DataObject::class;
+        $this->resultClass = '\\' . \Magento\Framework\DataObject_MyResult::class;
+        $this->_model = $this->getMockForAbstractClass(\Magento\Framework\Code\Generator\EntityAbstract::class);
     }
 
     protected function tearDown()
@@ -75,26 +64,37 @@ public function testConstruct()
         // without parameters
         $this->assertAttributeEmpty('_sourceClassName', $this->_model);
         $this->assertAttributeEmpty('_resultClassName', $this->_model);
-        $this->assertAttributeInstanceOf(Io::class, '_ioObject', $this->_model);
-        $this->assertAttributeInstanceOf(ClassGenerator::class, '_classGenerator', $this->_model);
-        $this->assertAttributeInstanceOf(DefinedClasses::class, 'definedClasses', $this->_model);
+        $this->assertAttributeInstanceOf(\Magento\Framework\Code\Generator\Io::class, '_ioObject', $this->_model);
+        $this->assertAttributeInstanceOf(
+            \Magento\Framework\Code\Generator\ClassGenerator::class,
+            '_classGenerator',
+            $this->_model
+        );
+        $this->assertAttributeInstanceOf(
+            \Magento\Framework\Code\Generator\DefinedClasses::class,
+            'definedClasses',
+            $this->_model
+        );
 
         // with source class name
-        $this->_model = $this->getMockForAbstractClass(EntityAbstract::class, [$this->sourceClass]);
+        $this->_model = $this->getMockForAbstractClass(
+            \Magento\Framework\Code\Generator\EntityAbstract::class,
+            [$this->sourceClass]
+        );
         $this->assertAttributeEquals($this->sourceClass, '_sourceClassName', $this->_model);
         $this->assertAttributeEquals($this->sourceClass . 'Abstract', '_resultClassName', $this->_model);
 
         // with all arguments
         // Configure IoObject mock
-        $ioObject = $this->getMockBuilder(Io::class)
+        $ioObject = $this->getMockBuilder(\Magento\Framework\Code\Generator\Io::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $codeGenerator = $this->getMockBuilder(ClassGenerator::class)
+        $codeGenerator = $this->getMockBuilder(\Magento\Framework\Code\Generator\ClassGenerator::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->_model = $this->getMockForAbstractClass(
-            EntityAbstract::class,
+            \Magento\Framework\Code\Generator\EntityAbstract::class,
             [$this->sourceClass, $this->resultClass, $ioObject, $codeGenerator]
         );
         $this->assertAttributeEquals($this->resultClass, '_resultClassName', $this->_model);
@@ -186,7 +186,7 @@ public function testGenerate(
         }
         $abstractGetters = ['_getClassProperties', '_getClassMethods'];
         $this->_model = $this->getMockForAbstractClass(
-            EntityAbstract::class,
+            \Magento\Framework\Code\Generator\EntityAbstract::class,
             $arguments,
             '',
             true,
@@ -209,51 +209,6 @@ public function testGenerate(
         }
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function testGenerateFailure()
-    {
-        $infoMessage = 'Error: an object of a generated class may be a dependency for another object, but this '
-            . 'dependency has not been defined or set correctly in the signature of the related construct method. '
-            . 'Due to the current error, executing the CLI commands `bin/magento setup:di:compile` or `bin/magento '
-            . 'deploy:mode:set production` does not create the required generated classes. '
-            . 'Magento cannot write a class file to the "generated" directory that is read-only. Before using the '
-            . 'read-only file system, the classes to be generated must be created beforehand in the "generated" '
-            . 'directory. For details, see the "File systems access permissions" topic at http://devdocs.magento.com.';
-
-        $exceptionMessage = 'Some description';
-
-        $abstractGetters = ['_getClassProperties', '_getClassMethods'];
-
-        $arguments = $this->_prepareMocksForGenerateCode(true);
-
-        /** @var Io|Mock $ioObjectMock */
-        $ioObjectMock = $arguments['io_object'];
-        $ioObjectMock->expects($this->once())
-            ->method('writeResultFile')
-            ->with(self::RESULT_FILE, self::RESULT_CODE)
-            ->willThrowException(new FileSystemException(new Phrase($exceptionMessage)));
-
-        $this->_model = $this->getMockForAbstractClass(
-            EntityAbstract::class,
-            $arguments,
-            '',
-            true,
-            true,
-            true,
-            $abstractGetters
-        );
-        // we need to mock abstract methods to set correct return value type
-        foreach ($abstractGetters as $methodName) {
-            $this->_model->expects($this->any())->method($methodName)->will($this->returnValue([]));
-        }
-
-        $result = $this->_model->generate();
-        $this->assertFalse($result);
-        $this->assertEquals([$infoMessage, $exceptionMessage], $this->_model->getErrors());
-    }
-
     /**
      * Prepares mocks for validation verification
      *
@@ -271,7 +226,7 @@ protected function _prepareMocksForValidateData(
         $resultFileExists = false
     ) {
         // Configure DefinedClasses mock
-        $definedClassesMock = $this->createMock(DefinedClasses::class);
+        $definedClassesMock = $this->createMock(\Magento\Framework\Code\Generator\DefinedClasses::class);
         $definedClassesMock->expects($this->once())
             ->method('isClassLoadable')
             ->with($this->sourceClass)
@@ -284,7 +239,7 @@ protected function _prepareMocksForValidateData(
         }
 
         // Configure IoObject mock
-        $ioObject = $this->getMockBuilder(Io::class)
+        $ioObject = $this->getMockBuilder(\Magento\Framework\Code\Generator\Io::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -317,7 +272,7 @@ protected function _prepareMocksForGenerateCode($willWriteCode)
         // Configure mocks for the validation step
         $mocks = $this->_prepareMocksForValidateData();
 
-        $codeGenerator = $this->getMockBuilder(ClassGenerator::class)
+        $codeGenerator = $this->getMockBuilder(\Magento\Framework\Code\Generator\ClassGenerator::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -334,7 +289,7 @@ protected function _prepareMocksForGenerateCode($willWriteCode)
             ->will($this->returnValue($willWriteCode ? self::RESULT_CODE : null));
 
         // Add configuration for the generation step
-        /** @var Io|Mock $ioObject */
+        /** @var $ioObject \PHPUnit_Framework_MockObject_MockObject */
         $ioObject = $mocks['io_object'];
         if ($willWriteCode) {
             $ioObject->expects($this->once())->method('writeResultFile')->with(self::RESULT_FILE, self::RESULT_CODE);
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index 26ff96b7e86ff..0a4516900bfaa 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -127,15 +127,22 @@ public function testGenerateClassWhenClassIsNotGenerationSuccess()
      */
     public function testGenerateClassWithErrors()
     {
-        $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessage("Some error message 0\nSome error message 1\nSome error message 2");
-        $errorMessages = [
-            'Some error message 0',
-            'Some error message 1',
-            'Some error message 2',
-        ];
         $expectedEntities = array_values($this->expectedEntities);
         $resultClassName = self::SOURCE_CLASS . ucfirst(array_shift($expectedEntities));
+        $errorMessages = [
+            'Error message 0',
+            'Error message 1',
+            'Error message 2',
+        ];
+        $mainErrorMessage = 'Class ' . $resultClassName . ' generation error: The requested class did not generate properly, '
+            . 'because the \'generated\' directory permission is read-only. '
+            . 'If --- after running the \'bin/magento setup:di:compile\' CLI command when the \'generated\' '
+            . 'directory permission is set to write --- the requested class did not generate properly, then '
+            . 'you must add the generated class object to the signature of the related construct method, only.';
+        $FinalErrorMessage = implode(PHP_EOL, $errorMessages) . "\n" . $mainErrorMessage;
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage($FinalErrorMessage);
+
         /** @var ObjectManagerInterface|Mock $objectManagerMock */
         $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
         /** @var EntityAbstract|Mock $entityGeneratorMock */
@@ -163,6 +170,9 @@ public function testGenerateClassWithErrors()
         $entityGeneratorMock->expects($this->once())
             ->method('getErrors')
             ->willReturn($errorMessages);
+        $loggerMock->expects($this->once())
+            ->method('critical')
+            ->with($FinalErrorMessage);
         $this->model->setObjectManager($objectManagerMock);
         $this->model->generateClass($resultClassName);
     }

From 07dbc781cfeef700ac3084e322085338401135d3 Mon Sep 17 00:00:00 2001
From: Nadiya Syvokonenko <nsyvokonenko@magento.com>
Date: Thu, 5 Jul 2018 13:26:22 +0300
Subject: [PATCH 118/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions

---
 .../Magento/Framework/Code/Test/Unit/GeneratorTest.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index 0a4516900bfaa..38ac2637a7878 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -134,8 +134,8 @@ public function testGenerateClassWithErrors()
             'Error message 1',
             'Error message 2',
         ];
-        $mainErrorMessage = 'Class ' . $resultClassName . ' generation error: The requested class did not generate properly, '
-            . 'because the \'generated\' directory permission is read-only. '
+        $mainErrorMessage = 'Class ' . $resultClassName . ' generation error: The requested class did not generate '
+            . 'properly, because the \'generated\' directory permission is read-only. '
             . 'If --- after running the \'bin/magento setup:di:compile\' CLI command when the \'generated\' '
             . 'directory permission is set to write --- the requested class did not generate properly, then '
             . 'you must add the generated class object to the signature of the related construct method, only.';

From 8949985959002cb94bd9301707c4586c7421fe20 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Thu, 5 Jul 2018 15:50:14 +0300
Subject: [PATCH 119/127] ENGCOM-1816: [2.3] [improvement] Swatches LESS
 rewrite #15624

---
 .../Magento/blank/Magento_Swatches/web/css/source/_module.less  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
index 0716137ed1bbd..b5d604597148a 100644
--- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
@@ -249,7 +249,7 @@
                         }
 
                         &:after {
-                            border-color: @primary4 transparent transparent transparent;
+                            border-color: @color-white transparent transparent transparent;
                             border-width: 7px 7.5px 0 7.5px;
                             left: -15px;
                             top: 1px;

From ff194198d54800805d141f1df26a61350f85fc42 Mon Sep 17 00:00:00 2001
From: Nadiya Syvokonenko <nsyvokonenko@magento.com>
Date: Thu, 5 Jul 2018 16:05:30 +0300
Subject: [PATCH 120/127] MAGETWO-92986: Write Logs for Failed Process of
 Generating Factories in Extensions  - add logger to construct

---
 .../Magento/Framework/Code/Generator.php      | 30 +++++++++++--
 .../Code/Test/Unit/GeneratorTest.php          | 43 ++++++++-----------
 2 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index 0d1011587dc86..4dec7d1a28146 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -9,9 +9,9 @@
 use Magento\Framework\Code\Generator\EntityAbstract;
 use Magento\Framework\Code\Generator\Io;
 use Magento\Framework\ObjectManagerInterface;
-use Psr\Log\LoggerInterface;
 use Magento\Framework\Phrase;
 use Magento\Framework\Filesystem\Driver\File;
+use Psr\Log\LoggerInterface;
 
 class Generator
 {
@@ -41,19 +41,29 @@ class Generator
      */
     protected $objectManager;
 
+    /**
+     * Logger instance
+     *
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param Generator\Io $ioObject
      * @param array $generatedEntities
      * @param DefinedClasses $definedClasses
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         Io $ioObject = null,
         array $generatedEntities = [],
-        DefinedClasses $definedClasses = null
+        DefinedClasses $definedClasses = null,
+        LoggerInterface $logger = null
     ) {
         $this->_ioObject = $ioObject ?: new Io(new File());
         $this->definedClasses = $definedClasses ?: new DefinedClasses();
         $this->_generatedEntities = $generatedEntities;
+        $this->logger = $logger;
     }
 
     /**
@@ -114,7 +124,6 @@ public function generateClass($className)
             $this->tryToLoadSourceClass($className, $generator);
             if (!($file = $generator->generate())) {
                 /** @var $logger LoggerInterface */
-                $logger = $this->getObjectManager()->get(LoggerInterface::class);
                 $errors = $generator->getErrors();
                 $errors[] = 'Class ' . $className . ' generation error: The requested class did not generate properly, '
                     . 'because the \'generated\' directory permission is read-only. '
@@ -122,7 +131,7 @@ public function generateClass($className)
                     . 'directory permission is set to write --- the requested class did not generate properly, then '
                     . 'you must add the generated class object to the signature of the related construct method, only.';
                 $message = implode(PHP_EOL, $errors);
-                $logger->critical($message);
+                $this->getLogger()->critical($message);
                 throw new \RuntimeException($message);
             }
             if (!$this->definedClasses->isClassLoadableFromMemory($className)) {
@@ -132,6 +141,19 @@ public function generateClass($className)
         }
     }
 
+    /**
+     * Retrieve logger
+     *
+     * @return LoggerInterface
+     */
+    private function getLogger()
+    {
+        if (!$this->logger) {
+            $this->logger = $this->getObjectManager()->get(LoggerInterface::class);
+        }
+        return $this->logger;
+    }
+
     /**
      * Create entity generator
      *
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
index 38ac2637a7878..110e769029898 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php
@@ -30,7 +30,7 @@ class GeneratorTest extends TestCase
      *
      * @var array
      */
-    protected $expectedEntities = [
+    private $expectedEntities = [
         'factory' => Factory::ENTITY_TYPE,
         'proxy' => Proxy::ENTITY_TYPE,
         'interceptor' => Interceptor::ENTITY_TYPE,
@@ -41,17 +41,22 @@ class GeneratorTest extends TestCase
      *
      * @var Generator
      */
-    protected $model;
+    private $model;
 
     /**
      * @var Io|Mock
      */
-    protected $ioObjectMock;
+    private $ioObjectMock;
 
     /**
      * @var DefinedClasses|Mock
      */
-    protected $definedClassesMock;
+    private $definedClassesMock;
+
+    /**
+     * @var LoggerInterface|Mock
+     */
+    private $loggerMock;
 
     protected function setUp()
     {
@@ -59,20 +64,23 @@ protected function setUp()
         $this->ioObjectMock = $this->getMockBuilder(Io::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->model = $this->buildModel(
+        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+
+        $this->model = new Generator(
             $this->ioObjectMock,
             [
                 'factory' => Factory::class,
                 'proxy' => Proxy::class,
-                'interceptor' => Interceptor::class
+                'interceptor' => Interceptor::class,
             ],
-            $this->definedClassesMock
+            $this->definedClassesMock,
+            $this->loggerMock
         );
     }
 
     public function testGetGeneratedEntities()
     {
-        $this->model = $this->buildModel(
+        $this->model = new Generator(
             $this->ioObjectMock,
             ['factory', 'proxy', 'interceptor'],
             $this->definedClassesMock
@@ -149,7 +157,6 @@ public function testGenerateClassWithErrors()
         $entityGeneratorMock = $this->getMockBuilder(EntityAbstract::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $loggerMock = $this->createMock(LoggerInterface::class);
 
         $objectManagerMock->expects($this->once())
             ->method('create')
@@ -164,13 +171,10 @@ public function testGenerateClassWithErrors()
         $entityGeneratorMock->expects($this->once())
             ->method('generate')
             ->willReturn(false);
-        $objectManagerMock->expects($this->once())
-            ->method('get')
-            ->willReturn($loggerMock);
         $entityGeneratorMock->expects($this->once())
             ->method('getErrors')
             ->willReturn($errorMessages);
-        $loggerMock->expects($this->once())
+        $this->loggerMock->expects($this->once())
             ->method('critical')
             ->with($FinalErrorMessage);
         $this->model->setObjectManager($objectManagerMock);
@@ -220,17 +224,4 @@ public function generateValidClassDataProvider()
         }
         return $data;
     }
-
-    /**
-     * Build SUT object
-     *
-     * @param Io $ioObject
-     * @param array $generatedEntities
-     * @param DefinedClasses $definedClasses
-     * @return Generator
-     */
-    private function buildModel(Io $ioObject, array $generatedEntities, DefinedClasses $definedClasses)
-    {
-        return new Generator($ioObject, $generatedEntities, $definedClasses);
-    }
 }

From 5ef85a92bd62aaff9da804959f81e2f08c5f3589 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Thu, 5 Jul 2018 18:24:21 +0300
Subject: [PATCH 121/127] MC-2338: 3rd party library/dependency upgrade for 2.3
 pre Alpha

---
 .../Test/Unit/Rule/Design/FinalImplementationTest.php         | 4 ++--
 .../Framework/Composer/Test/Unit/ComposerInformationTest.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php
index 23875f543a419..ca944b5c60e11 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php
@@ -8,8 +8,8 @@
 
 use PHPUnit\Framework\TestCase as TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use PHPUnit_Framework_MockObject_Matcher_InvokedRecorder as InvokedRecorder;
-use PHPUnit\Framework\MockObject_Builder_InvocationMocker as InvocationMocker;
+use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder as InvokedRecorder;
+use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMocker;
 use Magento\CodeMessDetector\Rule\Design\FinalImplementation;
 use PHPMD\Report;
 use PHPMD\AbstractNode;
diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php b/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
index 74f8c1dcdb875..27a222e6bceb9 100644
--- a/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
+++ b/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
@@ -28,12 +28,12 @@ class ComposerInformationTest extends \PHPUnit\Framework\TestCase
     private $lockerMock;
 
     /**
-     * @var \Composer\Repository\RepositoryInterface|\PHPUnit\Framework_MockObject_Builder_InvocationMocker:
+     * @var \Composer\Repository\RepositoryInterface|\PHPUnit\Framework\MockObject\Builder\InvocationMocker
      */
     private $lockerRepositoryMock;
 
     /**
-     * @var \Composer\Package\CompletePackageInterface|\PHPUnit\Framework_MockObject_Builder_InvocationMocker:
+     * @var \Composer\Package\CompletePackageInterface|\PHPUnit\Framework\MockObject\Builder\InvocationMocker
      */
     private $packageMock;
 

From e0c6caf8e34e475524e00480e353d39807ae25ba Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <okolesnyk@magento.com>
Date: Thu, 5 Jul 2018 16:04:24 -0500
Subject: [PATCH 122/127] MQE-1075: Move MFTF tests from dev/tests/acceptance
 to app/code

---
 .../AdminNotification/Test/Mftf}/LICENSE.txt  |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../AdminNotification/Test/Mftf/README.md     |   3 +
 .../AdminNotification/Test/Mftf/composer.json |  20 +
 .../Test/Mftf}/LICENSE.txt                    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../Test/Mftf/README.md                       |   3 +
 .../Test/Mftf/composer.json                   |  23 +
 .../AdvancedSearch/Test/Mftf}/LICENSE.txt     |   0
 .../AdvancedSearch/Test/Mftf}/LICENSE_AFL.txt |   0
 .../AdvancedSearch/Test/Mftf/README.md        |   3 +
 .../AdvancedSearch/Test/Mftf/composer.json    |  22 +
 .../code/Magento/Amqp/Test/Mftf}/LICENSE.txt  |   0
 .../Magento/Amqp/Test/Mftf}/LICENSE_AFL.txt   |   0
 app/code/Magento/Amqp/Test/Mftf/README.md     |   3 +
 app/code/Magento/Amqp/Test/Mftf/composer.json |  17 +
 .../Analytics/Test/Mftf}/Data/UserData.xml    |   2 +-
 .../Test/Mftf}/Data/UserRoleData.xml          |   2 +-
 .../Magento/Analytics/Test/Mftf}/LICENSE.txt  |   0
 .../Analytics/Test/Mftf}/LICENSE_AFL.txt      |   0
 .../Test/Mftf}/Metadata/user-meta.xml         |   2 +-
 .../Test/Mftf}/Metadata/user_role-meta.xml    |   2 +-
 .../Magento/Analytics/Test/Mftf/README.md     |   3 +
 .../AdminConfigurationBlankIndustryTest.xml   |   2 +-
 ...onfigurationEnableDisableAnalyticsTest.xml |   2 +-
 .../Test/AdminConfigurationIndustryTest.xml   |   2 +-
 .../Test/AdminConfigurationPermissionTest.xml |   2 +-
 .../AdminConfigurationTimeToSendDataTest.xml  |   2 +-
 .../Magento/Analytics/Test/Mftf/composer.json |  20 +
 .../Test/Mftf/README.md                       |   3 +
 .../Test/Mftf/composer.json                   |  24 +
 .../Authorization/Test/Mftf}/LICENSE.txt      |   0
 .../Authorization/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Magento/Authorization/Test/Mftf/README.md |   3 +
 .../Authorization/Test/Mftf/composer.json     |  17 +
 .../Authorizenet/Test/Mftf}/LICENSE.txt       |   0
 .../Authorizenet/Test/Mftf}/LICENSE_AFL.txt   |   0
 .../Magento/Authorizenet/Test/Mftf/README.md  |   3 +
 .../Authorizenet/Test/Mftf/composer.json      |  25 +
 .../Mftf}/ActionGroup/LoginActionGroup.xml    |   2 +-
 .../ActionGroup/LoginAsAdminActionGroup.xml   |   2 +-
 .../Mftf}/ActionGroup/LogoutActionGroup.xml   |   2 +-
 .../ActionGroup/SecondaryGridActionGroup.xml  |   2 +-
 .../SortByIdDescendingActionGroup.xml         |   2 +-
 .../Backend/Test/Mftf}/Data/BackenedData.xml  |   2 +-
 .../Magento/Backend/Test/Mftf}/LICENSE.txt    |   0
 .../Backend/Test/Mftf}/LICENSE_AFL.txt        |   0
 .../Page/AdminConfigurationStoresPage.xml     |   2 +-
 .../Test/Mftf}/Page/AdminLoginPage.xml        |   2 +-
 .../Test/Mftf}/Page/AdminLogoutPage.xml       |   2 +-
 app/code/Magento/Backend/Test/Mftf/README.md  |   3 +
 .../Section/AdminConfirmationModalSection.xml |   2 +-
 .../Mftf}/Section/AdminGridTableSection.xml   |   2 +-
 .../Test/Mftf}/Section/AdminHeaderSection.xml |   2 +-
 .../Mftf}/Section/AdminLoginFormSection.xml   |   2 +-
 .../Mftf}/Section/AdminMainActionsSection.xml |   2 +-
 .../Mftf}/Section/AdminMessagesSection.xml    |   2 +-
 .../Section/AdminSecondaryGridSection.xml     |   2 +-
 .../Test/Mftf}/Test/AdminLoginTest.xml        |   2 +-
 .../Magento/Backend/Test/Mftf/composer.json   |  35 +
 .../Magento/Backup/Test/Mftf}/LICENSE.txt     |   0
 .../Magento/Backup/Test/Mftf}/LICENSE_AFL.txt |   0
 app/code/Magento/Backup/Test/Mftf/README.md   |   3 +
 .../Magento/Backup/Test/Mftf/composer.json    |  19 +
 .../Test/Mftf}/Data/BraintreeData.xml         |   2 +-
 .../Magento/Braintree/Test/Mftf}/LICENSE.txt  |   0
 .../Braintree/Test/Mftf}/LICENSE_AFL.txt      |   0
 .../Mftf}/Metadata/braintree_config-meta.xml  |   2 +-
 .../Magento/Braintree/Test/Mftf/README.md     |   3 +
 .../Magento/Braintree/Test/Mftf/composer.json |  33 +
 .../AdminBundleProductActionGroup.xml         |   2 +-
 .../AdminClearFiltersActionGroup.xml          |   2 +-
 .../BundleProductFilterActionGroup.xml        |   2 +-
 .../CreateBundleProductActionGroup.xml        |   2 +-
 .../EnableDisableProductActionGroup.xml       |   2 +-
 .../Bundle/Test/Mftf}/Data/BundleLinkData.xml |   2 +-
 .../Test/Mftf}/Data/BundleOptionData.xml      |   2 +-
 .../Test/Mftf}/Data/CustomAttributeData.xml   |   2 +-
 .../Bundle/Test/Mftf}/Data/ProductData.xml    |   2 +-
 .../Magento/Bundle/Test/Mftf}/LICENSE.txt     |   0
 .../Magento/Bundle/Test/Mftf}/LICENSE_AFL.txt |   0
 .../Test/Mftf}/Metadata/bundle_link-meta.xml  |   2 +-
 .../Mftf}/Metadata/bundle_option-meta.xml     |   2 +-
 .../Mftf}/Metadata/bundle_options-meta.xml    |   2 +-
 .../Mftf}/Page/AdminCatalogProductPage.xml    |   2 +-
 .../Mftf}/Page/AdminProductCreatePage.xml     |   2 +-
 app/code/Magento/Bundle/Test/Mftf/README.md   |   3 +
 .../Section/AdminProductFormBundleSection.xml |   2 +-
 .../Mftf}/Section/BundleStorefrontSection.xml |   2 +-
 .../Section/StorefrontBundledSection.xml      |   2 +-
 .../Mftf}/Test/AdminAddBundleItemsTest.xml    |   2 +-
 .../AdminAddDefaultImageBundleProductTest.xml |   2 +-
 .../Test/AdminAttributeSetSelectionTest.xml   |   2 +-
 .../Mftf}/Test/AdminDeleteABundleProduct.xml  |   2 +-
 .../AdminFilterProductListByBundleProduct.xml |   2 +-
 .../Test/AdminMassDeleteBundleProducts.xml    |   2 +-
 .../Test/AdminProductBundleCreationTest.xml   |   2 +-
 ...minRemoveDefaultImageBundleProductTest.xml |   2 +-
 .../Test/BundleProductFixedPricingTest.xml    |   2 +-
 .../EnableDisableBundleProductStatusTest.xml  |   2 +-
 .../Test/Mftf}/Test/EndToEndB2CAdminTest.xml  |   2 +-
 .../MassEnableDisableBundleProductsTest.xml   |   2 +-
 .../Test/NewBundleProductSelectionTest.xml    |   2 +-
 .../Test/StorefrontAdminEditDataTest.xml      |   2 +-
 .../Test/StorefrontEditBundleProductTest.xml  | 248 ++---
 .../Magento/Bundle/Test/Mftf/composer.json    |  36 +
 .../Magento/BundleGraphQl/Test/Mftf/README.md |   3 +
 .../BundleGraphQl/Test/Mftf/composer.json     |  20 +
 .../BundleImportExport/Test/Mftf}/LICENSE.txt |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../BundleImportExport/Test/Mftf/README.md    |   3 +
 .../Test/Mftf/composer.json                   |  22 +
 .../CacheInvalidate/Test/Mftf}/LICENSE.txt    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../CacheInvalidate/Test/Mftf/README.md       |   3 +
 .../CacheInvalidate/Test/Mftf/composer.json   |  17 +
 .../Magento/Captcha/Test/Mftf}/LICENSE.txt    |   0
 .../Captcha/Test/Mftf}/LICENSE_AFL.txt        |   0
 app/code/Magento/Captcha/Test/Mftf/README.md  |   3 +
 .../Magento/Captcha/Test/Mftf/composer.json   |  20 +
 .../AddProductToCartActionGroup.xml           |   2 +-
 .../ActionGroup/AdminCategoryActionGroup.xml  |   2 +-
 .../AdminCreateRootCategoryActionGroup.xml    |   2 +-
 .../ActionGroup/AdminProductActionGroup.xml   |   2 +-
 .../AdminProductAttributeActionGroup.xml      |   2 +-
 .../AdminProductAttributeSetActionGroup.xml   |   2 +-
 .../AdminProductGridActionGroup.xml           |   2 +-
 ...uctInStorefrontCategoryPageActionGroup.xml |   2 +-
 ...ductInStorefrontProductPageActionGroup.xml |   2 +-
 ...heckItemInLayeredNavigationActionGroup.xml |   2 +-
 .../ActionGroup/CustomOptionsActionGroup.xml  |   2 +-
 .../ActionGroup/MoveCategoryActionGroup.xml   |   2 +-
 .../OpenEditProductOnBackendActionGroup.xml   |   2 +-
 ...OpenProductFromCategoryPageActionGroup.xml |   2 +-
 .../RestoreLayoutSettingActionGroup.xml       |   2 +-
 .../SearchAndMultiselectActionGroup.xml       |   2 +-
 .../SearchForProductOnBackendActionGroup.xml  |   2 +-
 ...artCustomOptionsProductPageActionGroup.xml |   2 +-
 .../StorefrontCategoryActionGroup.xml         |   2 +-
 .../StorefrontCompareActionGroup.xml          |   2 +-
 .../StorefrontProductActionGroup.xml          |   2 +-
 .../StorefrontProductPageActionGroup.xml      |   2 +-
 .../Catalog/Test/Mftf}/Data/CategoryData.xml  |   2 +-
 .../Catalog/Test/Mftf}/Data/ConstData.xml     |   2 +-
 .../Test/Mftf}/Data/CustomAttributeData.xml   |   2 +-
 .../Test/Mftf}/Data/FrontendLabelData.xml     |   2 +-
 .../Test/Mftf}/Data/ImageContentData.xml      |   2 +-
 .../Test/Mftf}/Data/ProductAttributeData.xml  |   2 +-
 .../ProductAttributeMediaGalleryEntryData.xml |   2 +-
 .../Mftf}/Data/ProductAttributeOptionData.xml |   2 +-
 .../Mftf}/Data/ProductAttributeSetData.xml    |   2 +-
 .../Catalog/Test/Mftf}/Data/ProductData.xml   |   2 +-
 .../Data/ProductExtensionAttributeData.xml    |   2 +-
 .../Test/Mftf}/Data/ProductGridData.xml       |   2 +-
 .../Test/Mftf}/Data/ProductOptionData.xml     |   2 +-
 .../Mftf}/Data/ProductOptionValueData.xml     |   2 +-
 .../Catalog/Test/Mftf}/Data/StockItemData.xml |   2 +-
 .../Test/Mftf}/Data/StoreLabelData.xml        |   2 +-
 .../Magento/Catalog/Test/Mftf}/LICENSE.txt    |   0
 .../Catalog/Test/Mftf}/LICENSE_AFL.txt        |   0
 .../Test/Mftf}/Metadata/category-meta.xml     |   2 +-
 .../Mftf}/Metadata/custom_attribute-meta.xml  |   2 +-
 .../empty_extension_attribute-meta.xml        |   2 +-
 .../Mftf}/Metadata/frontend_label-meta.xml    |   2 +-
 .../Test/Mftf}/Metadata/product-meta.xml      |   2 +-
 .../Mftf}/Metadata/product_attribute-meta.xml |   2 +-
 ...uct_attribute_media_gallery_entry-meta.xml |   2 +-
 .../product_attribute_option-meta.xml         |   2 +-
 .../Metadata/product_attribute_set-meta.xml   |   2 +-
 .../product_extension_attribute-meta.xml      |   2 +-
 .../Test/Mftf}/Metadata/product_link-meta.xml |   2 +-
 .../product_link_extension_attribute-meta.xml |   2 +-
 .../Mftf}/Metadata/product_links-meta.xml     |   2 +-
 .../Mftf}/Metadata/product_option-meta.xml    |   2 +-
 .../Metadata/product_option_value-meta.xml    |   2 +-
 .../Test/Mftf}/Metadata/stock_item-meta.xml   |   2 +-
 .../Test/Mftf}/Metadata/store_label-meta.xml  |   2 +-
 .../Mftf}/Metadata/validation_rule-meta.xml   |   2 +-
 .../Test/Mftf}/Page/AdminCategoryEditPage.xml |   2 +-
 .../Test/Mftf}/Page/AdminCategoryPage.xml     |   2 +-
 .../Page/AdminProductAttributeFormPage.xml    |   2 +-
 .../Page/AdminProductAttributeGridPage.xml    |   2 +-
 .../Page/AdminProductAttributeSetEditPage.xml |   2 +-
 .../Page/AdminProductAttributeSetGridPage.xml |   2 +-
 .../Page/AdminProductAttributesEditPage.xml   |   2 +-
 .../Mftf}/Page/AdminProductCreatePage.xml     |   2 +-
 .../Test/Mftf}/Page/AdminProductEditPage.xml  |   2 +-
 .../Test/Mftf}/Page/AdminProductIndexPage.xml |   2 +-
 .../Test/Mftf}/Page/ProductCatalogPage.xml    |   2 +-
 .../Mftf}/Page/StorefrontCategoryPage.xml     |   2 +-
 .../Page/StorefrontProductComparePage.xml     |   2 +-
 .../Test/Mftf}/Page/StorefrontProductPage.xml |   2 +-
 app/code/Magento/Catalog/Test/Mftf/README.md  |   3 +
 .../AdminAddProductsToOptionPanelSection.xml  |   2 +-
 .../AdminCategoryBasicFieldSection.xml        |   2 +-
 .../Section/AdminCategoryContentSection.xml   |   2 +-
 .../AdminCategoryMainActionsSection.xml       |   2 +-
 .../Section/AdminCategoryMessagesSection.xml  |   2 +-
 .../Section/AdminCategoryModalSection.xml     |   2 +-
 .../AdminCategoryProductsGridSection.xml      |   2 +-
 .../Section/AdminCategoryProductsSection.xml  |   2 +-
 .../Mftf}/Section/AdminCategorySEOSection.xml |   2 +-
 .../AdminCategorySidebarActionSection.xml     |   2 +-
 .../AdminCategorySidebarTreeSection.xml       |   2 +-
 ...minCategoryWarningMessagesPopupSection.xml |   2 +-
 .../AdminCreateProductAttributeSection.xml    |   2 +-
 .../AdminEditProductAttributesSection.xml     |   2 +-
 .../AdminProductAttributeGridSection.xml      |   2 +-
 .../AdminProductAttributeSetActionSection.xml |   2 +-
 .../AdminProductAttributeSetEditSection.xml   |   2 +-
 .../AdminProductAttributeSetGridSection.xml   |   2 +-
 .../AdminProductAttributeSetSection.xml       |   2 +-
 .../AdminProductCategoryCreationSection.xml   |   2 +-
 .../Section/AdminProductContentSection.xml    |   2 +-
 ...AdminProductCustomizableOptionsSection.xml |   2 +-
 .../Section/AdminProductFiltersSection.xml    |   2 +-
 .../Section/AdminProductFormActionSection.xml |   2 +-
 .../AdminProductFormChangeStoreSection.xml    |   2 +-
 .../Mftf}/Section/AdminProductFormSection.xml |   2 +-
 .../Section/AdminProductGridActionSection.xml |   2 +-
 .../AdminProductGridConfirmActionSection.xml  |   2 +-
 .../Section/AdminProductGridFilterSection.xml |   2 +-
 .../AdminProductGridPaginationSection.xml     |   2 +-
 .../Mftf}/Section/AdminProductGridSection.xml |   2 +-
 .../AdminProductGridTableHeaderSection.xml    |   2 +-
 .../Section/AdminProductImagesSection.xml     |   2 +-
 .../Section/AdminProductMessagesSection.xml   |   2 +-
 .../AdminProductModalSlideGridSection.xml     |   2 +-
 ...inProductRelatedUpSellCrossSellSection.xml |   2 +-
 .../Mftf}/Section/AdminProductSEOSection.xml  |   2 +-
 .../Section/AdminUpdateAttributesSection.xml  |   2 +-
 .../StorefrontCategoryFilterSection.xml       |   2 +-
 .../Section/StorefrontCategoryMainSection.xml |   2 +-
 .../StorefrontCategoryProductSection.xml      |   2 +-
 .../StorefrontCategorySidebarSection.xml      |   2 +-
 .../StorefrontComparisonSidebarSection.xml    |   2 +-
 .../Mftf}/Section/StorefrontFooterSection.xml |   2 +-
 .../Mftf}/Section/StorefrontHeaderSection.xml |   2 +-
 .../Section/StorefrontMessagesSection.xml     |   2 +-
 .../Section/StorefrontNavigationSection.xml   |   2 +-
 ...StorefrontProducRelatedProductsSection.xml |   2 +-
 .../StorefrontProductActionSection.xml        |   2 +-
 .../StorefrontProductCompareMainSection.xml   |   2 +-
 .../StorefrontProductInfoDetailsSection.xml   |   2 +-
 .../StorefrontProductInfoMainSection.xml      |   2 +-
 .../Section/StorefrontProductMediaSection.xml |   2 +-
 ...torefrontProductMoreInformationSection.xml |   2 +-
 .../Section/StorefrontProductPageSection.xml  |   2 +-
 .../AdminAddDefaultImageSimpleProductTest.xml |   2 +-
 ...AdminAddDefaultImageVirtualProductTest.xml |   2 +-
 .../Test/AdminAddImageForCategoryTest.xml     |   2 +-
 .../AdminAddImageToWYSIWYGCatalogTest.xml     |   2 +-
 .../AdminAddImageToWYSIWYGProductTest.xml     |   2 +-
 ...signProductAttributeToAttributeSetTest.xml |   2 +-
 ...AdminCreateCategoryFromProductPageTest.xml |   2 +-
 .../Mftf}/Test/AdminCreateCategoryTest.xml    |   2 +-
 .../AdminCreateProductCustomAttributeSet.xml  |   2 +-
 .../AdminCreateProductDuplicateUrlkeyTest.xml |   2 +-
 ...CreateRootCategoryAndSubcategoriesTest.xml |   2 +-
 .../Test/AdminCreateSimpleProductTest.xml     |   2 +-
 ...dminCreateSimpleProductWithUnicodeTest.xml |   2 +-
 ...dminEditTextEditorProductAttributeTest.xml |   2 +-
 .../AdminMassChangeProductsStatusTest.xml     |   2 +-
 ...UpdateProductAttributesGlobalScopeTest.xml |   2 +-
 ...ductAttributesMissingRequiredFieldTest.xml |   2 +-
 ...ateProductAttributesStoreViewScopeTest.xml |   2 +-
 .../Test/AdminMoveAnchoredCategoryTest.xml    |   2 +-
 ...inMultipleWebsitesUseDefaultValuesTest.xml |   2 +-
 ...roductGridFilteringByDateAttributeTest.xml |   2 +-
 ...ctStatusAttributeDisabledByDefaultTest.xml |   2 +-
 ...minRemoveDefaultImageSimpleProductTest.xml |   2 +-
 ...inRemoveDefaultImageVirtualProductTest.xml |   2 +-
 .../Test/AdminRemoveImageFromCategoryTest.xml |   2 +-
 .../Test/AdminSimpleProductImagesTest.xml     |   2 +-
 ...gnProductAttributeFromAttributeSetTest.xml |   2 +-
 .../AdminUpdateCategoryStoreUrlKeyTest.xml    |   2 +-
 .../AdvanceCatalogSearchSimpleProductTest.xml |   2 +-
 ...bleOptionTextInputLengthValidationHint.xml |   2 +-
 .../Test/Mftf}/Test/DeleteCategoriesTest.xml  |   2 +-
 .../Test/Mftf}/Test/EndToEndB2CAdminTest.xml  |   2 +-
 .../Mftf}/Test/EndToEndB2CGuestUserTest.xml   |   2 +-
 .../Test/EndToEndB2CLoggedInUserTest.xml      |   2 +-
 ...ductWithCustomOptionsSecondWebsiteTest.xml |   2 +-
 .../SimpleProductTwoCustomOptionsTest.xml     | 178 ++--
 .../StorefrontProductNameWithDoubleQuote.xml  |   2 +-
 ...torefrontProductWithEmptyAttributeTest.xml |   2 +-
 ...tProductsCompareWithEmptyAttributeTest.xml |   2 +-
 ...roductCustomOptionsDifferentStoreViews.xml |   2 +-
 ...efrontPurchaseProductWithCustomOptions.xml |   2 +-
 ...ldCategoriesShouldNotIncludeInMenuTest.xml |   2 +-
 ...rifyDefaultWYSIWYGToolbarOnProductTest.xml |   2 +-
 ...yTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml |   2 +-
 ...yTinyMCEv4IsNativeWYSIWYGOnProductTest.xml |   2 +-
 .../Magento/Catalog/Test/Mftf/composer.json   |  44 +
 .../CatalogAnalytics/Test/Mftf}/LICENSE.txt   |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../CatalogAnalytics/Test/Mftf/README.md      |   3 +
 .../CatalogAnalytics/Test/Mftf/composer.json  |  17 +
 .../CatalogGraphQl/Test/Mftf/README.md        |   3 +
 .../CatalogGraphQl/Test/Mftf/composer.json    |  26 +
 .../Test/Mftf}/LICENSE.txt                    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../CatalogImportExport/Test/Mftf/README.md   |   3 +
 .../Test/Mftf/composer.json                   |  25 +
 .../DisplayOutOfStockProductActionGroup.xml   |   2 +-
 .../CatalogInventory/Test/Mftf}/LICENSE.txt   |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../Mftf}/Page/InventoryConfigurationPage.xml |   2 +-
 .../CatalogInventory/Test/Mftf/README.md      |   3 +
 .../Test/Mftf}/Section/InventorySection.xml   |   2 +-
 .../CatalogInventory/Test/Mftf/composer.json  |  23 +
 .../Test/Mftf}/Data/CatalogRuleData.xml       |   2 +-
 .../CatalogRule/Test/Mftf}/LICENSE.txt        |   0
 .../CatalogRule/Test/Mftf}/LICENSE_AFL.txt    |   0
 .../Test/Mftf}/Metadata/catalog-rule-meta.xml |   2 +-
 .../Magento/CatalogRule/Test/Mftf/README.md   |   3 +
 .../CatalogRule/Test/Mftf/composer.json       |  27 +
 .../Test/Mftf}/LICENSE.txt                    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../Test/Mftf/README.md                       |   3 +
 .../Test/Mftf/composer.json                   |  23 +
 .../StorefrontCatalogSearchActionGroup.xml    |   2 +-
 .../Test/Mftf}/Data/ConstData.xml             |   2 +-
 .../CatalogSearch/Test/Mftf}/LICENSE.txt      |   0
 .../CatalogSearch/Test/Mftf}/LICENSE_AFL.txt  |   0
 ...torefrontCatalogSearchAdvancedFormPage.xml |   2 +-
 ...refrontCatalogSearchAdvancedResultPage.xml |   2 +-
 .../Page/StorefrontCatalogSearchPage.xml      |   2 +-
 .../Magento/CatalogSearch/Test/Mftf/README.md |   3 +
 ...efrontCatalogSearchAdvancedFormSection.xml |   2 +-
 ...CatalogSearchAdvancedResultMainSection.xml |   2 +-
 .../StorefrontCatalogSearchMainSection.xml    |   2 +-
 .../Mftf}/Section/StorefrontFooterSection.xml |   2 +-
 .../AdvanceCatalogSearchSimpleProductTest.xml |   2 +-
 .../Mftf}/Test/EndToEndB2CGuestUserTest.xml   |   2 +-
 .../Test/EndToEndB2CLoggedInUserTest.xml      |   2 +-
 .../CatalogSearch/Test/Mftf/composer.json     |  26 +
 .../CatalogUrlRewrite/Test/Mftf}/LICENSE.txt  |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../CatalogUrlRewrite/Test/Mftf/README.md     |   3 +
 .../CatalogUrlRewrite/Test/Mftf/composer.json |  24 +
 .../Test/Mftf/README.md                       |   3 +
 .../Test/Mftf/composer.json                   |  21 +
 .../CatalogWidget/Test/Mftf}/LICENSE.txt      |   0
 .../CatalogWidget/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Magento/CatalogWidget/Test/Mftf/README.md |   3 +
 .../CatalogWidget/Test/Mftf/composer.json     |  24 +
 .../Mftf}/ActionGroup/CheckoutActionGroup.xml |   2 +-
 ...eckoutFillNewBillingAddressActionGroup.xml |   2 +-
 .../StorefrontMiniCartActionGroup.xml         |   2 +-
 .../StorefrontProductCartActionGroup.xml      |   2 +-
 .../Checkout/Test/Mftf}/Data/ConstData.xml    |   2 +-
 .../Checkout/Test/Mftf}/Data/QuoteData.xml    |   2 +-
 .../Magento/Checkout/Test/Mftf}/LICENSE.txt   |   0
 .../Checkout/Test/Mftf}/LICENSE_AFL.txt       |   0
 .../Test/Mftf}/Page/CheckoutCartPage.xml      |   2 +-
 .../Checkout/Test/Mftf}/Page/CheckoutPage.xml |   2 +-
 .../Test/Mftf}/Page/CheckoutSuccessPage.xml   |   2 +-
 .../GuestCheckoutReviewAndPaymentsPage.xml    |   2 +-
 app/code/Magento/Checkout/Test/Mftf/README.md |   3 +
 .../Section/CheckoutCartProductSection.xml    |   2 +-
 .../Section/CheckoutCartSummarySection.xml    |   2 +-
 .../Mftf}/Section/CheckoutHeaderSection.xml   |   2 +-
 .../Section/CheckoutOrderSummarySection.xml   |   2 +-
 .../Mftf}/Section/CheckoutPaymentSection.xml  |   2 +-
 .../CheckoutShippingGuestInfoSection.xml      |   2 +-
 .../CheckoutShippingMethodsSection.xml        |   2 +-
 .../Mftf}/Section/CheckoutShippingSection.xml |   2 +-
 .../Section/CheckoutSuccessMainSection.xml    |   2 +-
 .../CheckoutSuccessRegisterSection.xml        |   2 +-
 .../StoreFrontRemoveItemModalSection.xml      |   2 +-
 .../StorefrontCategoryProductSection.xml      |   2 +-
 .../Section/StorefrontMessagesSection.xml     |   2 +-
 .../Section/StorefrontMiniCartSection.xml     |   2 +-
 .../StorefrontProductCompareMainSection.xml   |   2 +-
 .../StorefrontProductInfoMainSection.xml      |   2 +-
 .../Test/CheckCheckoutSuccessPageTest.xml     |   2 +-
 .../Mftf}/Test/EndToEndB2CGuestUserTest.xml   |   2 +-
 .../Test/EndToEndB2CLoggedInUserTest.xml      |   2 +-
 ...koutForProductsDeletedFromMiniCartTest.xml |   2 +-
 .../Test/StorefrontCustomerCheckoutTest.xml   |   2 +-
 .../Test/StorefrontGuestCheckoutTest.xml      |   2 +-
 .../Magento/Checkout/Test/Mftf/composer.json  |  36 +
 .../CheckoutAgreements/Test/Mftf}/LICENSE.txt |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../CheckoutAgreements/Test/Mftf/README.md    |   3 +
 .../Test/Mftf/composer.json                   |  20 +
 .../AssertCMSBlockContentActionGroup.xml      |   2 +-
 .../AssertCMSPageContentActionGroup.xml       |   2 +-
 .../AssignBlockToCMSPageActionGroup.xml       |   2 +-
 .../Test/Mftf}/ActionGroup/CMSActionGroup.xml |   2 +-
 .../DeleteImageFromStorageActionGroup.xml     |   2 +-
 .../FillOutBlockContentActionGroup.xml        |   2 +-
 .../FillOutCMSPageContentActionGroup.xml      |   2 +-
 .../NavigateToMediaFolderActionGroup.xml      |   2 +-
 .../RestoreLayoutSettingActionGroup.xml       |   2 +-
 .../SearchBlockOnGridPageActionGroup.xml      |   2 +-
 ...SelectImageFromMediaStorageActionGroup.xml |   2 +-
 .../ActionGroup/VerifyTinyMCEActionGroup.xml  |   2 +-
 .../Cms/Test/Mftf}/Data/BlockPageData.xml     |   2 +-
 .../Cms/Test/Mftf}/Data/CmsPageData.xml       |   2 +-
 .../code/Magento/Cms/Test/Mftf}/LICENSE.txt   |   0
 .../Magento/Cms/Test/Mftf}/LICENSE_AFL.txt    |   0
 .../Cms/Test/Mftf}/Metadata/block-meta.xml    |   2 +-
 .../Cms/Test/Mftf}/Metadata/cms-meta.xml      |   2 +-
 .../Cms/Test/Mftf}/Page/CmsBlocksPage.xml     |   2 +-
 .../Cms/Test/Mftf}/Page/CmsNewBlockPage.xml   |   2 +-
 .../Cms/Test/Mftf}/Page/CmsNewPagePage.xml    |   2 +-
 .../Cms/Test/Mftf}/Page/CmsPagesPage.xml      |   2 +-
 .../Test/Mftf}/Page/StorefrontHomePage.xml    |   2 +-
 app/code/Magento/Cms/Test/Mftf/README.md      |   3 +
 .../Mftf}/Section/BlockPageActionsSection.xml |   2 +-
 .../CmsNewBlockBlockActionsSection.xml        |   2 +-
 .../CmsNewBlockBlockBasicFieldsSection.xml    |   2 +-
 .../Section/CmsNewPagePageActionsSection.xml  |   2 +-
 .../CmsNewPagePageBasicFieldsSection.xml      |   2 +-
 .../Section/CmsNewPagePageContentSection.xml  |   2 +-
 .../Section/CmsNewPagePageSeoSection.xml      |   2 +-
 .../Section/CmsPagesPageActionsSection.xml    |   2 +-
 .../Mftf}/Section/CustomVariableSection.xml   |   2 +-
 .../Mftf}/Section/StorefrontBlockSection.xml  |   2 +-
 .../Section/StorefrontCMSPageSection.xml      |   2 +-
 .../Mftf}/Section/StorefrontHeaderSection.xml |   2 +-
 .../Cms/Test/Mftf}/Section/TinyMCESection.xml |   2 +-
 .../Test/AdminAddImageToWYSIWYGBlockTest.xml  |   2 +-
 .../Test/AdminAddImageToWYSIWYGCMSTest.xml    |   2 +-
 .../AdminAddVariableToWYSIWYGBlockTest.xml    |   2 +-
 .../Test/AdminAddVariableToWYSIWYGCMSTest.xml |   2 +-
 .../Test/AdminAddWidgetToWYSIWYGBlockTest.xml |   2 +-
 ...WidgetToWYSIWYGWithCMSPageLinkTypeTest.xml |   2 +-
 ...getToWYSIWYGWithCMSStaticBlockTypeTest.xml |   2 +-
 ...WYSIWYGWithCatalogCategoryLinkTypeTest.xml |   2 +-
 ...oWYSIWYGWithCatalogProductLinkTypeTest.xml |   2 +-
 ...oWYSIWYGWithCatalogProductListTypeTest.xml |   2 +-
 ...YGWithRecentlyComparedProductsTypeTest.xml |   2 +-
 ...IWYGWithRecentlyViewedProductsTypeTest.xml |   2 +-
 .../Mftf}/Test/AdminCreateCmsBlockTest.xml    |   2 +-
 .../Mftf}/Test/AdminCreateCmsPageTest.xml     |   2 +-
 ...ifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml |   2 +-
 ...yTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml |   2 +-
 app/code/Magento/Cms/Test/Mftf/composer.json  |  28 +
 .../CmsUrlRewrite/Test/Mftf}/LICENSE.txt      |   0
 .../CmsUrlRewrite/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Magento/CmsUrlRewrite/Test/Mftf/README.md |   3 +
 .../CmsUrlRewrite/Test/Mftf/composer.json     |  19 +
 .../CmsUrlRewriteGraphQl/Test/Mftf/README.md  |   3 +
 .../Test/Mftf/composer.json                   |  23 +
 .../ConfigAdminAccountSharingActionGroup.xml  |   2 +-
 .../ActionGroup/ConfigWYSIWYGActionGroup.xml  |   2 +-
 .../ConfigWebUrlOptionsActionGroup.xml        |   2 +-
 .../GeneralConfigurationActionGroup.xml       |   2 +-
 .../RestoreLayoutSettingActionGroup.xml       |   2 +-
 .../Mftf}/ActionGroup/SwitcherActionGroup.xml |   2 +-
 .../Magento/Config/Test/Mftf}/LICENSE.txt     |   0
 .../Magento/Config/Test/Mftf}/LICENSE_AFL.txt |   0
 .../Test/Mftf}/Page/AdminConfigPage.xml       |   2 +-
 app/code/Magento/Config/Test/Mftf/README.md   |   3 +
 .../Test/Mftf}/Section/AdminConfigSection.xml |   2 +-
 .../Test/Mftf}/Section/AdminSection.xml       |   2 +-
 .../Test/Mftf}/Section/GeneralSection.xml     |   2 +-
 .../Test/Mftf}/Section/StoreConfigSection.xml |   2 +-
 .../Magento/Config/Test/Mftf/composer.json    |  23 +
 .../Test/Mftf}/LICENSE.txt                    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../Test/Mftf/README.md                       |   3 +
 .../Test/Mftf/composer.json                   |  21 +
 .../AdminConfigurableProductActionGroup.xml   |   2 +-
 ...ConfigurableProductCheckoutActionGroup.xml |   2 +-
 .../StorefrontCategoryActionGroup.xml         |   2 +-
 .../StorefrontCompareActionGroup.xml          |   2 +-
 .../StorefrontProductActionGroup.xml          |   2 +-
 .../StorefrontProductCartActionGroup.xml      |   2 +-
 .../Mftf}/Data/ConfigurableProductData.xml    |   2 +-
 .../Data/ConfigurableProductOptionData.xml    |   2 +-
 .../Test/Mftf}/Data/ConstData.xml             |   2 +-
 .../Data/ProductConfigurableAttributeData.xml |   2 +-
 .../Test/Mftf}/Data/ValueIndexData.xml        |   2 +-
 .../Test/Mftf}/LICENSE.txt                    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../configurable_product_add_child-meta.xml   |   2 +-
 .../configurable_product_options-meta.xml     |   2 +-
 ...bute_configurable_product_options-meta.xml |   2 +-
 .../Test/Mftf}/Metadata/valueIndex-meta.xml   |   2 +-
 .../Mftf}/Page/AdminProductCreatePage.xml     |   2 +-
 .../ConfigurableProduct/Test/Mftf/README.md   |   3 +
 ...AdminChooseAffectedAttributeSetSection.xml |   2 +-
 ...reateProductConfigurationsPanelSection.xml |   2 +-
 .../Section/AdminNewAttributePanelSection.xml |   2 +-
 .../AdminProductFormConfigurationsSection.xml |   2 +-
 .../Section/AdminProductGridActionSection.xml |   2 +-
 .../StorefrontProductInfoMainSection.xml      |   2 +-
 .../AdminAddDefaultImageConfigurableTest.xml  |   2 +-
 .../AdminConfigurableProductCreateTest.xml    |   2 +-
 .../AdminConfigurableProductDeleteTest.xml    |   2 +-
 ...AdminConfigurableProductOutOfStockTest.xml | 268 ++---
 .../AdminConfigurableProductSearchTest.xml    |   2 +-
 ...ConfigurableProductUpdateAttributeTest.xml |   2 +-
 .../AdminConfigurableProductUpdateTest.xml    |   2 +-
 .../Mftf}/Test/AdminRelatedProductsTest.xml   |   2 +-
 ...dminRemoveDefaultImageConfigurableTest.xml |   2 +-
 ...bleProductPriceAdditionalStoreViewTest.xml |   2 +-
 .../Test/Mftf}/Test/EndToEndB2CAdminTest.xml  |   2 +-
 .../Mftf}/Test/EndToEndB2CGuestUserTest.xml   |   2 +-
 .../Test/EndToEndB2CLoggedInUserTest.xml      |   2 +-
 ...orefrontConfigurableProductDetailsTest.xml |   2 +-
 .../StorefrontConfigurableProductViewTest.xml |   2 +-
 .../Test/Mftf/composer.json                   |  34 +
 .../Test/Mftf/README.md                       |   3 +
 .../Test/Mftf/composer.json                   |  19 +
 .../Test/Mftf}/LICENSE.txt                    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../Test/Mftf/README.md                       |   3 +
 .../Test/Mftf/composer.json                   |  22 +
 .../Magento/Contact/Test/Mftf}/LICENSE.txt    |   0
 .../Contact/Test/Mftf}/LICENSE_AFL.txt        |   0
 app/code/Magento/Contact/Test/Mftf/README.md  |   3 +
 .../Magento/Contact/Test/Mftf/composer.json   |  20 +
 .../Magento/Cookie/Test/Mftf}/LICENSE.txt     |   0
 .../Magento/Cookie/Test/Mftf}/LICENSE_AFL.txt |   0
 app/code/Magento/Cookie/Test/Mftf/README.md   |   3 +
 .../Magento/Cookie/Test/Mftf/composer.json    |  20 +
 .../code/Magento/Cron/Test/Mftf}/LICENSE.txt  |   0
 .../Magento/Cron/Test/Mftf}/LICENSE_AFL.txt   |   0
 app/code/Magento/Cron/Test/Mftf/README.md     |   3 +
 app/code/Magento/Cron/Test/Mftf/composer.json |  20 +
 .../CurrencySymbol/Test/Mftf}/LICENSE.txt     |   0
 .../CurrencySymbol/Test/Mftf}/LICENSE_AFL.txt |   0
 .../CurrencySymbol/Test/Mftf/README.md        |   3 +
 .../CurrencySymbol/Test/Mftf/composer.json    |  21 +
 .../LoginToStorefrontActionGroup.xml          |   2 +-
 .../OpenEditCustomerFromAdminActionGroup.xml  |   2 +-
 ...SignUpNewUserFromStorefrontActionGroup.xml |   2 +-
 .../Customer/Test/Mftf}/Data/AddressData.xml  |   2 +-
 .../Customer/Test/Mftf}/Data/CustomerData.xml |   2 +-
 .../Test/Mftf}/Data/CustomerGroupData.xml     |   2 +-
 .../Mftf}/Data/ExtensionAttributeSimple.xml   |   2 +-
 .../Customer/Test/Mftf}/Data/RegionData.xml   |   2 +-
 .../Magento/Customer/Test/Mftf}/LICENSE.txt   |   0
 .../Customer/Test/Mftf}/LICENSE_AFL.txt       |   0
 .../Test/Mftf}/Metadata/address-meta.xml      |   2 +-
 .../Test/Mftf}/Metadata/customer-meta.xml     |   2 +-
 .../customer_extension_attribute-meta.xml     |   2 +-
 ...stomer_nested_extension_attribute-meta.xml |   2 +-
 .../Test/Mftf}/Metadata/region-meta.xml       |   2 +-
 .../Test/Mftf}/Page/AdminCustomerPage.xml     |   2 +-
 .../Test/Mftf}/Page/AdminEditCustomerPage.xml |   2 +-
 .../Test/Mftf}/Page/AdminNewCustomerPage.xml  |   2 +-
 .../Page/StorefrontCustomerCreatePage.xml     |   2 +-
 .../Page/StorefrontCustomerDashboardPage.xml  |   2 +-
 .../Page/StorefrontCustomerOrderPage.xml      |   2 +-
 .../Page/StorefrontCustomerOrderViewPage.xml  |   2 +-
 .../Page/StorefrontCustomerSignInPage.xml     |   2 +-
 .../Test/Mftf}/Page/StorefrontHomePage.xml    |   2 +-
 app/code/Magento/Customer/Test/Mftf/README.md |   3 +
 ...AdminCustomerAccountInformationSection.xml |   2 +-
 .../Section/AdminCustomerFiltersSection.xml   |  34 +-
 .../AdminCustomerGridMainActionsSection.xml   |   2 +-
 .../Section/AdminCustomerGridSection.xml      |   2 +-
 .../AdminCustomerMainActionsSection.xml       |   2 +-
 .../Section/AdminCustomerMessagesSection.xml  |   2 +-
 .../AdminEditCustomerInformationSection.xml   |   2 +-
 .../AdminEditCustomerOrdersSection.xml        |   2 +-
 .../StorefrontCustomerCreateFormSection.xml   |   2 +-
 ...omerDashboardAccountInformationSection.xml |   2 +-
 .../StorefrontCustomerOrderSection.xml        |   2 +-
 .../StorefrontCustomerOrderViewSection.xml    |   2 +-
 .../StorefrontCustomerSignInFormSection.xml   |   2 +-
 .../Section/StorefrontPanelHeaderSection.xml  |   2 +-
 .../Mftf}/Test/AdminCreateCustomerTest.xml    |   2 +-
 .../Test/EndToEndB2CLoggedInUserTest.xml      |   2 +-
 .../Test/StorefrontCreateCustomerTest.xml     |   2 +-
 .../StorefrontPersistedCustomerLoginTest.xml  |   2 +-
 .../Magento/Customer/Test/Mftf/composer.json  |  39 +
 .../CustomerAnalytics/Test/Mftf}/LICENSE.txt  |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../CustomerAnalytics/Test/Mftf/README.md     |   3 +
 .../CustomerAnalytics/Test/Mftf/composer.json |  17 +
 .../CustomerGraphQl/Test/Mftf/README.md       |   3 +
 .../CustomerGraphQl/Test/Mftf/composer.json   |  21 +
 .../Test/Mftf}/LICENSE.txt                    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../CustomerImportExport/Test/Mftf/README.md  |   3 +
 .../Test/Mftf/composer.json                   |  22 +
 .../Magento/Deploy/Test/Mftf}/LICENSE.txt     |   0
 .../Magento/Deploy/Test/Mftf}/LICENSE_AFL.txt |   0
 app/code/Magento/Deploy/Test/Mftf/README.md   |   3 +
 .../Magento/Deploy/Test/Mftf/composer.json    |  20 +
 .../Magento/Developer/Test/Mftf}/LICENSE.txt  |   0
 .../Developer/Test/Mftf}/LICENSE_AFL.txt      |   0
 .../Magento/Developer/Test/Mftf/README.md     |   3 +
 .../Magento/Developer/Test/Mftf/composer.json |  18 +
 .../code/Magento/Dhl/Test/Mftf}/LICENSE.txt   |   0
 .../Magento/Dhl/Test/Mftf}/LICENSE_AFL.txt    |   0
 app/code/Magento/Dhl/Test/Mftf/README.md      |   3 +
 app/code/Magento/Dhl/Test/Mftf/composer.json  |  28 +
 .../Magento/Directory/Test/Mftf}/LICENSE.txt  |   0
 .../Directory/Test/Mftf}/LICENSE_AFL.txt      |   0
 .../Magento/Directory/Test/Mftf/README.md     |   3 +
 .../Magento/Directory/Test/Mftf/composer.json |  19 +
 .../AdminDownloadableProductActionGroup.xml   |   2 +-
 .../Downloadable/Test/Mftf}/Data/LinkData.xml |   2 +-
 .../Test/Mftf}/Data/ProductData.xml           |   2 +-
 .../Downloadable/Test/Mftf}/LICENSE.txt       |   0
 .../Downloadable/Test/Mftf}/LICENSE_AFL.txt   |   0
 .../Mftf}/Metadata/downloadable_link-meta.xml |   2 +-
 .../Mftf}/Metadata/link_file_content-meta.xml |   2 +-
 .../Metadata/sample_file_content-meta.xml     |   2 +-
 .../Mftf}/Page/AdminProductCreatePage.xml     |   2 +-
 .../Magento/Downloadable/Test/Mftf/README.md  |   3 +
 .../AdminProductDownloadableSection.xml       |   2 +-
 ...AddDefaultImageDownloadableProductTest.xml |   2 +-
 ...oveDefaultImageDownloadableProductTest.xml |   2 +-
 .../Test/Mftf}/Test/EndToEndB2CAdminTest.xml  |   2 +-
 .../Downloadable/Test/Mftf/composer.json      |  35 +
 .../DownloadableGraphQl/Test/Mftf/README.md   |   3 +
 .../Test/Mftf/composer.json                   |  21 +
 .../Test/Mftf}/LICENSE.txt                    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../Test/Mftf/README.md                       |   3 +
 .../Test/Mftf/composer.json                   |  22 +
 .../code/Magento/Eav/Test/Mftf}/LICENSE.txt   |   0
 .../Magento/Eav/Test/Mftf}/LICENSE_AFL.txt    |   0
 app/code/Magento/Eav/Test/Mftf/README.md      |   3 +
 app/code/Magento/Eav/Test/Mftf/composer.json  |  21 +
 .../Magento/EavGraphQl/Test/Mftf/README.md    |   3 +
 .../EavGraphQl/Test/Mftf/composer.json        |  19 +
 .../Elasticsearch/Test/Mftf}/LICENSE.txt      |   0
 .../Elasticsearch/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Magento/Elasticsearch/Test/Mftf/README.md |   3 +
 .../Elasticsearch/Test/Mftf/composer.json     |  26 +
 .../code/Magento/Email/Test/Mftf}/LICENSE.txt |   0
 .../Magento/Email/Test/Mftf}/LICENSE_AFL.txt  |   0
 app/code/Magento/Email/Test/Mftf/README.md    |   3 +
 .../Magento/Email/Test/Mftf/composer.json     |  25 +
 .../EncryptionKey/Test/Mftf}/LICENSE.txt      |   0
 .../EncryptionKey/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Magento/EncryptionKey/Test/Mftf/README.md |   3 +
 .../EncryptionKey/Test/Mftf/composer.json     |  17 +
 .../code/Magento/Fedex/Test/Mftf}/LICENSE.txt |   0
 .../Magento/Fedex/Test/Mftf}/LICENSE_AFL.txt  |   0
 app/code/Magento/Fedex/Test/Mftf/README.md    |   3 +
 .../Magento/Fedex/Test/Mftf/composer.json     |  24 +
 .../GiftMessage/Test/Mftf}/LICENSE.txt        |   0
 .../GiftMessage/Test/Mftf}/LICENSE_AFL.txt    |   0
 .../Magento/GiftMessage/Test/Mftf/README.md   |   3 +
 .../GiftMessage/Test/Mftf/composer.json       |  27 +
 .../GoogleAdwords/Test/Mftf}/LICENSE.txt      |   0
 .../GoogleAdwords/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Magento/GoogleAdwords/Test/Mftf/README.md |   3 +
 .../GoogleAdwords/Test/Mftf/composer.json     |  18 +
 .../GoogleAnalytics/Test/Mftf}/LICENSE.txt    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../GoogleAnalytics/Test/Mftf/README.md       |   3 +
 .../GoogleAnalytics/Test/Mftf/composer.json   |  22 +
 .../GoogleOptimizer/Test/Mftf}/LICENSE.txt    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../GoogleOptimizer/Test/Mftf/README.md       |   3 +
 .../GoogleOptimizer/Test/Mftf/composer.json   |  22 +
 app/code/Magento/GraphQl/Test/Mftf/README.md  |   3 +
 .../Magento/GraphQl/Test/Mftf/composer.json   |  22 +
 .../Test/Mftf}/LICENSE.txt                    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../GroupedImportExport/Test/Mftf/README.md   |   3 +
 .../Test/Mftf/composer.json                   |  21 +
 .../AdminGroupedProductActionGroup.xml        |   2 +-
 .../Test/Mftf}/Data/GroupedProductData.xml    |   2 +-
 .../Test/Mftf}/Data/ProductLinkData.xml       |   2 +-
 .../ProductLinkExtensionAttributeData.xml     |   2 +-
 .../Test/Mftf}/Data/ProductLinksData.xml      |   2 +-
 .../GroupedProduct/Test/Mftf}/LICENSE.txt     |   0
 .../GroupedProduct/Test/Mftf}/LICENSE_AFL.txt |   0
 .../Mftf}/Page/AdminProductCreatePage.xml     |   2 +-
 .../GroupedProduct/Test/Mftf/README.md        |   3 +
 .../AdminAddProductsToGroupPanelSection.xml   |   2 +-
 ...AdminProductFormGroupedProductsSection.xml |   2 +-
 ...AdminAddDefaultImageGroupedProductTest.xml |   2 +-
 ...inRemoveDefaultImageGroupedProductTest.xml |   2 +-
 .../Test/Mftf}/Test/EndToEndB2CAdminTest.xml  |   2 +-
 .../GroupedProduct/Test/Mftf/composer.json    |  31 +
 .../GroupedProductGraphQl/Test/Mftf/README.md |   3 +
 .../Test/Mftf/composer.json                   |  18 +
 .../ImportExport/Test/Mftf}/LICENSE.txt       |   0
 .../ImportExport/Test/Mftf}/LICENSE_AFL.txt   |   0
 .../Magento/ImportExport/Test/Mftf/README.md  |   3 +
 .../ImportExport/Test/Mftf/composer.json      |  21 +
 .../Magento/Indexer/Test/Mftf}/LICENSE.txt    |   0
 .../Indexer/Test/Mftf}/LICENSE_AFL.txt        |   0
 app/code/Magento/Indexer/Test/Mftf/README.md  |   3 +
 .../Magento/Indexer/Test/Mftf/composer.json   |  17 +
 .../InstantPurchase/Test/Mftf/README.md       |   3 +
 .../InstantPurchase/Test/Mftf/composer.json   |  23 +
 .../Integration/Test/Mftf}/LICENSE.txt        |   0
 .../Integration/Test/Mftf}/LICENSE_AFL.txt    |   0
 .../Magento/Integration/Test/Mftf/README.md   |   3 +
 .../Integration/Test/Mftf/composer.json       |  22 +
 .../LayeredNavigation/Test/Mftf}/LICENSE.txt  |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../LayeredNavigation/Test/Mftf/README.md     |   3 +
 .../LayeredNavigation/Test/Mftf/composer.json |  18 +
 .../Marketplace/Test/Mftf}/LICENSE.txt        |   0
 .../Marketplace/Test/Mftf}/LICENSE_AFL.txt    |   0
 .../Magento/Marketplace/Test/Mftf/README.md   |   3 +
 .../Marketplace/Test/Mftf/composer.json       |  17 +
 .../MediaStorage/Test/Mftf}/LICENSE.txt       |   0
 .../MediaStorage/Test/Mftf}/LICENSE_AFL.txt   |   0
 .../Magento/MediaStorage/Test/Mftf/README.md  |   3 +
 .../MediaStorage/Test/Mftf/composer.json      |  21 +
 .../MessageQueue/Test/Mftf}/LICENSE.txt       |   0
 .../MessageQueue/Test/Mftf}/LICENSE_AFL.txt   |   0
 .../Magento/MessageQueue/Test/Mftf/README.md  |   3 +
 .../MessageQueue/Test/Mftf/composer.json      |  16 +
 .../code/Magento/Msrp/Test/Mftf}/LICENSE.txt  |   0
 .../Magento/Msrp/Test/Mftf}/LICENSE_AFL.txt   |   0
 app/code/Magento/Msrp/Test/Mftf/README.md     |   3 +
 app/code/Magento/Msrp/Test/Mftf/composer.json |  26 +
 .../Multishipping/Test/Mftf}/LICENSE.txt      |   0
 .../Multishipping/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Magento/Multishipping/Test/Mftf/README.md |   3 +
 .../Multishipping/Test/Mftf/composer.json     |  25 +
 .../Magento/MysqlMq/Test/Mftf}/LICENSE.txt    |   0
 .../MysqlMq/Test/Mftf}/LICENSE_AFL.txt        |   0
 app/code/Magento/MysqlMq/Test/Mftf/README.md  |   3 +
 .../Magento/MysqlMq/Test/Mftf/composer.json   |  17 +
 .../NewRelicReporting/Test/Mftf}/LICENSE.txt  |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../NewRelicReporting/Test/Mftf/README.md     |   3 +
 .../NewRelicReporting/Test/Mftf/composer.json |  23 +
 .../Mftf}/Data/NewsletterTemplateData.xml     |   2 +-
 .../Magento/Newsletter/Test/Mftf}/LICENSE.txt |   0
 .../Newsletter/Test/Mftf}/LICENSE_AFL.txt     |   0
 .../Mftf}/Page/NewsletterTemplatePage.xml     |   2 +-
 .../Magento/Newsletter/Test/Mftf/README.md    |   3 +
 .../Section/NewsletterTemplateSection.xml     |   2 +-
 .../Section/StorefrontNewsletterSection.xml   |   2 +-
 .../AdminAddImageToWYSIWYGNewsletterTest.xml  |   2 +-
 ...dminAddVariableToWYSIWYGNewsletterTest.xml |   2 +-
 .../AdminAddWidgetToWYSIWYGNewsletterTest.xml |   2 +-
 ...nyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml |   2 +-
 .../Newsletter/Test/Mftf/composer.json        |  24 +
 .../OfflinePayments/Test/Mftf}/LICENSE.txt    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../OfflinePayments/Test/Mftf/README.md       |   3 +
 .../OfflinePayments/Test/Mftf/composer.json   |  21 +
 .../OfflineShipping/Test/Mftf}/LICENSE.txt    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../OfflineShipping/Test/Mftf/README.md       |   3 +
 .../OfflineShipping/Test/Mftf/composer.json   |  29 +
 .../ActionGroup/ClearCacheActionGroup.xml     |   2 +-
 .../ActionGroup/ClearPageCacheActionGroup.xml |   2 +-
 .../Magento/PageCache/Test/Mftf}/LICENSE.txt  |   0
 .../PageCache/Test/Mftf}/LICENSE_AFL.txt      |   0
 .../Magento/PageCache/Test/Mftf/README.md     |   3 +
 .../Section/AdminCacheManagementSection.xml   |   2 +-
 .../Magento/PageCache/Test/Mftf/composer.json |  19 +
 .../Test/Mftf}/Data/PaymentMethodData.xml     |   2 +-
 .../Magento/Payment/Test/Mftf}/LICENSE.txt    |   0
 .../Payment/Test/Mftf}/LICENSE_AFL.txt        |   0
 .../Mftf}/Metadata/payment_method-meta.xml    |   2 +-
 app/code/Magento/Payment/Test/Mftf/README.md  |   3 +
 .../Magento/Payment/Test/Mftf/composer.json   |  22 +
 .../Paypal/Test/Mftf}/Data/PaypalData.xml     |   2 +-
 .../Magento/Paypal/Test/Mftf}/LICENSE.txt     |   0
 .../Magento/Paypal/Test/Mftf}/LICENSE_AFL.txt |   0
 .../Mftf}/Metadata/paypal_config-meta.xml     |   2 +-
 .../Page/AdminConfigPaymentMethodsPage.xml    |   2 +-
 app/code/Magento/Paypal/Test/Mftf/README.md   |   3 +
 .../Section/OtherPaymentsConfigSection.xml    |   2 +-
 .../Test/AdminConfigPaymentsSectionState.xml  |   2 +-
 .../Magento/Paypal/Test/Mftf/composer.json    |  34 +
 .../Test/Mftf}/Data/PersistentData.xml        |   2 +-
 .../Magento/Persistent/Test/Mftf}/LICENSE.txt |   0
 .../Persistent/Test/Mftf}/LICENSE_AFL.txt     |   0
 .../Mftf}/Metadata/persistent_config-meta.xml |   2 +-
 .../Magento/Persistent/Test/Mftf/README.md    |   3 +
 ...GuestCheckoutWithEnabledPersistentTest.xml |   2 +-
 .../Persistent/Test/Mftf/composer.json        |  22 +
 .../ProductAlert/Test/Mftf}/LICENSE.txt       |   0
 .../ProductAlert/Test/Mftf}/LICENSE_AFL.txt   |   0
 .../Magento/ProductAlert/Test/Mftf/README.md  |   3 +
 .../ProductAlert/Test/Mftf/composer.json      |  23 +
 .../AdminProductVideoActionGroup.xml          |   2 +-
 .../StorefrontProductVideoActionGroup.xml     |   2 +-
 .../Mftf}/Data/ProductVideoConfigData.xml     |   2 +-
 .../Test/Mftf}/Data/ProductVideoData.xml      |   2 +-
 .../ProductVideo/Test/Mftf}/LICENSE.txt       |   0
 .../ProductVideo/Test/Mftf}/LICENSE_AFL.txt   |   0
 .../Metadata/product_video_config-meta.xml    |   2 +-
 .../Magento/ProductVideo/Test/Mftf/README.md  |   3 +
 .../Section/AdminProductImagesSection.xml     |   2 +-
 .../Section/AdminProductNewVideoSection.xml   |   2 +-
 .../StorefrontProductInfoMainSection.xml      |   2 +-
 .../ProductVideo/Test/Mftf/composer.json      |  25 +
 .../Quote/Test/Mftf}/Data/CartItemData.xml    |   2 +-
 .../Quote/Test/Mftf}/Data/GuestCartData.xml   |   2 +-
 .../code/Magento/Quote/Test/Mftf}/LICENSE.txt |   0
 .../Magento/Quote/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Mftf}/Metadata/billing_address-meta.xml   |   2 +-
 .../Test/Mftf}/Metadata/guest_cart-meta.xml   |   2 +-
 .../Mftf}/Metadata/shipping_address-meta.xml  |   2 +-
 app/code/Magento/Quote/Test/Mftf/README.md    |   3 +
 .../Magento/Quote/Test/Mftf/composer.json     |  33 +
 .../QuoteAnalytics/Test/Mftf}/LICENSE.txt     |   0
 .../QuoteAnalytics/Test/Mftf}/LICENSE_AFL.txt |   0
 .../QuoteAnalytics/Test/Mftf/README.md        |   3 +
 .../QuoteAnalytics/Test/Mftf/composer.json    |  17 +
 .../Test/Mftf}/LICENSE.txt                    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../ReleaseNotification/Test/Mftf/README.md   |   3 +
 .../Test/Mftf/composer.json                   |  22 +
 .../Magento/Reports/Test/Mftf}/LICENSE.txt    |   0
 .../Reports/Test/Mftf}/LICENSE_AFL.txt        |   0
 app/code/Magento/Reports/Test/Mftf/README.md  |   3 +
 .../Magento/Reports/Test/Mftf/composer.json   |  32 +
 .../Magento/RequireJs/Test/Mftf}/LICENSE.txt  |   0
 .../RequireJs/Test/Mftf}/LICENSE_AFL.txt      |   0
 .../Magento/RequireJs/Test/Mftf/README.md     |   3 +
 .../Magento/RequireJs/Test/Mftf/composer.json |  16 +
 .../Magento/Review/Test/Mftf}/LICENSE.txt     |   0
 .../Magento/Review/Test/Mftf}/LICENSE_AFL.txt |   0
 app/code/Magento/Review/Test/Mftf/README.md   |   3 +
 .../Magento/Review/Test/Mftf/composer.json    |  28 +
 .../ReviewAnalytics/Test/Mftf}/LICENSE.txt    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../ReviewAnalytics/Test/Mftf/README.md       |   3 +
 .../ReviewAnalytics/Test/Mftf/composer.json   |  17 +
 .../Magento/Robots/Test/Mftf}/LICENSE.txt     |   0
 .../Magento/Robots/Test/Mftf}/LICENSE_AFL.txt |   0
 app/code/Magento/Robots/Test/Mftf/README.md   |   3 +
 .../Magento/Robots/Test/Mftf/composer.json    |  20 +
 .../code/Magento/Rss/Test/Mftf}/LICENSE.txt   |   0
 .../Magento/Rss/Test/Mftf}/LICENSE_AFL.txt    |   0
 app/code/Magento/Rss/Test/Mftf/README.md      |   3 +
 app/code/Magento/Rss/Test/Mftf/composer.json  |  19 +
 .../code/Magento/Rule/Test/Mftf}/LICENSE.txt  |   0
 .../Magento/Rule/Test/Mftf}/LICENSE_AFL.txt   |   0
 app/code/Magento/Rule/Test/Mftf/README.md     |   3 +
 app/code/Magento/Rule/Test/Mftf/composer.json |  20 +
 .../AdminCreditMemoActionGroup.xml            |   2 +-
 .../ActionGroup/AdminInvoiceActionGroup.xml   |   2 +-
 .../ActionGroup/AdminOrderActionGroup.xml     |   2 +-
 .../ActionGroup/AdminOrderGridActionGroup.xml |   2 +-
 .../Sales/Test/Mftf}/Data/AddressData.xml     |   2 +-
 .../Sales/Test/Mftf}/Data/ConstData.xml       |   2 +-
 .../Sales/Test/Mftf}/Data/OrderData.xml       |   2 +-
 .../code/Magento/Sales/Test/Mftf}/LICENSE.txt |   0
 .../Magento/Sales/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Mftf}/Page/AdminCreditMemoNewPage.xml     |   2 +-
 .../Mftf}/Page/AdminInvoiceDetailsPage.xml    |   2 +-
 .../Test/Mftf}/Page/AdminInvoiceNewPage.xml   |   2 +-
 .../Test/Mftf}/Page/AdminInvoicesPage.xml     |   2 +-
 .../Test/Mftf}/Page/AdminOrderCreatePage.xml  |   2 +-
 .../Test/Mftf}/Page/AdminOrderDetailsPage.xml |   2 +-
 .../Sales/Test/Mftf}/Page/AdminOrdersPage.xml |   2 +-
 app/code/Magento/Sales/Test/Mftf/README.md    |   3 +
 ...minCreditMemoAddressInformationSection.xml |   2 +-
 .../Section/AdminCreditMemoItemsSection.xml   |   2 +-
 ...AdminCreditMemoOrderInformationSection.xml |   2 +-
 .../AdminCreditMemoPaymentShippingSection.xml |   2 +-
 .../Section/AdminCreditMemoTotalSection.xml   |   2 +-
 .../AdminInvoiceAddressInformationSection.xml |   2 +-
 .../AdminInvoiceDetailsInformationSection.xml |   2 +-
 .../Section/AdminInvoiceItemsSection.xml      |   2 +-
 .../AdminInvoiceMainActionsSection.xml        |   2 +-
 .../AdminInvoiceOrderInformationSection.xml   |   2 +-
 .../AdminInvoicePaymentShippingSection.xml    |   2 +-
 .../Section/AdminInvoiceTotalSection.xml      |   2 +-
 .../Section/AdminInvoicesFiltersSection.xml   |   2 +-
 .../Section/AdminInvoicesGridSection.xml      |   2 +-
 .../AdminOrderAddressInformationSection.xml   |   2 +-
 .../Section/AdminOrderCommentsTabSection.xml  |   2 +-
 .../AdminOrderCreditMemosTabSection.xml       |   2 +-
 .../AdminOrderDetailsInformationSection.xml   |   2 +-
 .../AdminOrderDetailsInvoicesSection.xml      |   2 +-
 .../AdminOrderDetailsMainActionsSection.xml   |   2 +-
 .../AdminOrderDetailsMessagesSection.xml      |   2 +-
 .../AdminOrderDetailsOrderViewSection.xml     |   2 +-
 .../Section/AdminOrderFormAccountSection.xml  |   2 +-
 .../Section/AdminOrderFormActionSection.xml   |   2 +-
 .../AdminOrderFormBillingAddressSection.xml   |   2 +-
 .../AdminOrderFormConfigureProductSection.xml |   2 +-
 .../Section/AdminOrderFormItemsSection.xml    |   2 +-
 .../Section/AdminOrderFormPaymentSection.xml  |   2 +-
 .../AdminOrderFormShippingAddressSection.xml  |   2 +-
 .../Section/AdminOrderFormTotalSection.xml    |   2 +-
 .../Section/AdminOrderInvoicesTabSection.xml  |   2 +-
 .../Section/AdminOrderItemsOrderedSection.xml |   2 +-
 .../AdminOrderPaymentInformationSection.xml   |   2 +-
 .../Section/AdminOrderShipmentsTabSection.xml |   2 +-
 .../AdminOrderShippingInformationSection.xml  |   2 +-
 .../AdminOrderStoreScopeTreeSection.xml       |   2 +-
 .../Mftf}/Section/AdminOrderTotalSection.xml  |   2 +-
 .../Mftf}/Section/AdminOrdersGridSection.xml  |   2 +-
 .../Test/Mftf}/Section/OrdersGridSection.xml  |   2 +-
 .../Mftf}/Test/AdminCreateInvoiceTest.xml     |   2 +-
 ...minSubmitsOrderWithAndWithoutEmailTest.xml |   2 +-
 .../Test/Mftf}/Test/EndToEndB2CAdminTest.xml  |   2 +-
 .../Magento/Sales/Test/Mftf/composer.json     |  43 +
 .../SalesAnalytics/Test/Mftf}/LICENSE.txt     |   0
 .../SalesAnalytics/Test/Mftf}/LICENSE_AFL.txt |   0
 .../SalesAnalytics/Test/Mftf/README.md        |   3 +
 .../SalesAnalytics/Test/Mftf/composer.json    |  17 +
 .../SalesInventory/Test/Mftf}/LICENSE.txt     |   0
 .../SalesInventory/Test/Mftf}/LICENSE_AFL.txt |   0
 .../SalesInventory/Test/Mftf/README.md        |   3 +
 .../SalesInventory/Test/Mftf/composer.json    |  20 +
 .../AdminCartPriceRuleActionGroup.xml         |   2 +-
 .../ActionGroup/AdminSalesRuleActionGroup.xml |   2 +-
 .../ApplyCartRuleOnStorefrontActionGroup.xml  |   2 +-
 .../StorefrontSalesRuleActionGroup.xml        |   2 +-
 .../SalesRule/Test/Mftf}/Data/QuoteData.xml   |   2 +-
 .../Test/Mftf}/Data/SalesCouponData.xml       |   2 +-
 .../Test/Mftf}/Data/SalesRuleCouponData.xml   |   2 +-
 .../Test/Mftf}/Data/SalesRuleData.xml         |   2 +-
 .../Test/Mftf}/Data/SalesRuleLabelData.xml    |   2 +-
 .../Magento/SalesRule/Test/Mftf}/LICENSE.txt  |   0
 .../SalesRule/Test/Mftf}/LICENSE_AFL.txt      |   0
 .../Metadata/sales_rule-condition-meta.xml    |   2 +-
 .../Mftf}/Metadata/sales_rule-coupon-meta.xml |   2 +-
 .../Mftf}/Metadata/sales_rule-label-meta.xml  |   2 +-
 .../Test/Mftf}/Metadata/sales_rule-meta.xml   |   2 +-
 .../Mftf}/Page/AdminCartPriceRulesPage.xml    |   2 +-
 .../Test/Mftf}/Page/PriceRuleNewPage.xml      |   2 +-
 .../Magento/SalesRule/Test/Mftf/README.md     |   3 +
 .../AdminCartPriceRulesFormSection.xml        |   2 +-
 .../Section/AdminCartPriceRulesSection.xml    |   2 +-
 .../Section/CheckoutCartSummarySection.xml    |   2 +-
 .../Test/Mftf}/Section/DiscountSection.xml    |   2 +-
 .../Section/PriceRuleConditionsSection.xml    |   2 +-
 .../StorefrontSalesRuleCartCouponSection.xml  |   2 +-
 .../Test/AdminCreateBuyXGetYFreeTest.xml      |   2 +-
 ...inCreateCartPriceRuleForCouponCodeTest.xml |   2 +-
 ...ateCartPriceRuleForGeneratedCouponTest.xml |   2 +-
 .../AdminCreateFixedAmountDiscountTest.xml    |   2 +-
 ...CreateFixedAmountWholeCartDiscountTest.xml |   2 +-
 .../AdminCreatePercentOfProductPriceTest.xml  |   2 +-
 .../Mftf}/Test/EndToEndB2CGuestUserTest.xml   |   2 +-
 .../Test/EndToEndB2CLoggedInUserTest.xml      |   2 +-
 .../Test/PriceRuleCategoryNestingTest.xml     |   2 +-
 .../Test/StorefrontCartPriceRuleCountry.xml   |   2 +-
 .../Test/StorefrontCartPriceRulePostcode.xml  |   2 +-
 .../Test/StorefrontCartPriceRuleQuantity.xml  |   2 +-
 .../Test/StorefrontCartPriceRuleState.xml     |   2 +-
 .../Test/StorefrontCartPriceRuleSubtotal.xml  |   2 +-
 .../Magento/SalesRule/Test/Mftf/composer.json |  35 +
 .../SalesSequence/Test/Mftf}/LICENSE.txt      |   0
 .../SalesSequence/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Magento/SalesSequence/Test/Mftf/README.md |   3 +
 .../SalesSequence/Test/Mftf/composer.json     |  16 +
 .../Magento/SampleData/Test/Mftf/README.md    |   3 +
 .../SampleData/Test/Mftf/composer.json        |  19 +
 .../Magento/Search/Test/Mftf}/LICENSE.txt     |   0
 .../Magento/Search/Test/Mftf}/LICENSE_AFL.txt |   0
 app/code/Magento/Search/Test/Mftf/README.md   |   3 +
 .../Section/StorefrontQuickSearchSection.xml  |   2 +-
 .../Magento/Search/Test/Mftf/composer.json    |  21 +
 .../Magento/Security/Test/Mftf}/LICENSE.txt   |   0
 .../Security/Test/Mftf}/LICENSE_AFL.txt       |   0
 app/code/Magento/Security/Test/Mftf/README.md |   3 +
 .../Magento/Security/Test/Mftf/composer.json  |  22 +
 .../Magento/SendFriend/Test/Mftf}/LICENSE.txt |   0
 .../SendFriend/Test/Mftf}/LICENSE_AFL.txt     |   0
 .../Magento/SendFriend/Test/Mftf/README.md    |   3 +
 .../SendFriend/Test/Mftf/composer.json        |  19 +
 .../ActionGroup/AdminShipmentActionGroup.xml  |   2 +-
 .../Mftf}/Data/FlatRateShippingMethodData.xml |   2 +-
 .../Mftf}/Data/FreeShippingMethodData.xml     |   2 +-
 .../Test/Mftf}/Data/ShippingMethodData.xml    |   2 +-
 .../Magento/Shipping/Test/Mftf}/LICENSE.txt   |   0
 .../Shipping/Test/Mftf}/LICENSE_AFL.txt       |   0
 .../Mftf}/Metadata/shipping_methods-meta.xml  |   2 +-
 .../Test/Mftf}/Page/AdminShipmentNewPage.xml  |   2 +-
 app/code/Magento/Shipping/Test/Mftf/README.md |   3 +
 ...AdminShipmentAddressInformationSection.xml |   2 +-
 .../Section/AdminShipmentItemsSection.xml     |   2 +-
 .../AdminShipmentMainActionsSection.xml       |   2 +-
 .../AdminShipmentOrderInformationSection.xml  |   2 +-
 .../AdminShipmentPaymentShippingSection.xml   |   2 +-
 .../Section/AdminShipmentTotalSection.xml     |   2 +-
 .../Test/Mftf}/Test/EndToEndB2CAdminTest.xml  |   2 +-
 .../Magento/Shipping/Test/Mftf/composer.json  |  34 +
 .../Magento/Signifyd/Test/Mftf}/LICENSE.txt   |   0
 .../Signifyd/Test/Mftf}/LICENSE_AFL.txt       |   0
 app/code/Magento/Signifyd/Test/Mftf/README.md |   3 +
 .../Magento/Signifyd/Test/Mftf/composer.json  |  26 +
 .../Magento/Sitemap/Test/Mftf}/LICENSE.txt    |   0
 .../Sitemap/Test/Mftf}/LICENSE_AFL.txt        |   0
 app/code/Magento/Sitemap/Test/Mftf/README.md  |   3 +
 .../Magento/Sitemap/Test/Mftf/composer.json   |  28 +
 .../AdminCreateNewStoreGroupActionGroup.xml   |   2 +-
 .../AdminCreateStoreViewActionGroup.xml       |   2 +-
 .../AdminCreateWebsiteActionGroup.xml         |   2 +-
 .../AdminDeleteStoreViewActionGroup.xml       |   2 +-
 .../AdminDeleteWebsiteActionGroup.xml         |   2 +-
 .../AdminSwitchStoreViewActionGroup.xml       |   2 +-
 .../CreateCustomStoreViewActionGroup.xml      |   2 +-
 .../DeleteCustomStoreActionGroup.xml          |   2 +-
 .../StorefrontSwitchStoreViewActionGroup.xml  |   2 +-
 .../Store/Test/Mftf}/Data/StoreData.xml       |   2 +-
 .../Store/Test/Mftf}/Data/StoreGroupData.xml  |   2 +-
 .../code/Magento/Store/Test/Mftf}/LICENSE.txt |   0
 .../Magento/Store/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Store/Test/Mftf}/Metadata/store-meta.xml  |   2 +-
 .../Test/Mftf}/Metadata/store_group-meta.xml  |   2 +-
 .../Mftf}/Page/AdminSystemStoreDeletePage.xml |   2 +-
 .../Mftf}/Page/AdminSystemStoreEditPage.xml   |   2 +-
 .../Page/AdminSystemStoreGroupEditPage.xml    |   2 +-
 .../Mftf}/Page/AdminSystemStoreGroupPage.xml  |   2 +-
 .../Test/Mftf}/Page/AdminSystemStorePage.xml  |   2 +-
 .../Mftf}/Page/AdminSystemStoreViewPage.xml   |   2 +-
 .../Page/AdminSystemStoreWebsitePage.xml      |   2 +-
 app/code/Magento/Store/Test/Mftf/README.md    |   3 +
 .../Mftf}/Section/AdminMainActionsSection.xml |   2 +-
 .../Section/AdminNewStoreGroupSection.xml     |   2 +-
 .../Mftf}/Section/AdminNewStoreSection.xml    |   2 +-
 .../AdminNewStoreViewActionsSection.xml       |   2 +-
 .../Section/AdminNewWebsiteActionsSection.xml |   2 +-
 .../Mftf}/Section/AdminNewWebsiteSection.xml  |   2 +-
 .../AdminStoreBackupOptionsSection.xml        |   2 +-
 .../Section/AdminStoreGroupActionsSection.xml |   2 +-
 .../AdminStoresDeleteStoreGroupSection.xml    |   2 +-
 .../Mftf}/Section/AdminStoresGridSection.xml  |   2 +-
 .../Section/AdminStoresMainActionsSection.xml |   2 +-
 .../Mftf}/Section/StorefrontHeaderSection.xml |   2 +-
 .../Mftf}/Test/AdminCreateStoreGroupTest.xml  |   2 +-
 .../Mftf}/Test/AdminCreateStoreViewTest.xml   |   2 +-
 .../Magento/Store/Test/Mftf/composer.json     |  24 +
 .../Magento/StoreGraphQl/Test/Mftf/README.md  |   3 +
 .../StoreGraphQl/Test/Mftf/composer.json      |  20 +
 .../Magento/Swagger/Test/Mftf}/LICENSE.txt    |   0
 .../Swagger/Test/Mftf}/LICENSE_AFL.txt        |   0
 app/code/Magento/Swagger/Test/Mftf/README.md  |   3 +
 .../Magento/Swagger/Test/Mftf/composer.json   |  16 +
 .../SwaggerWebapi/Test/Mftf}/LICENSE.txt      |   0
 .../SwaggerWebapi/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Magento/SwaggerWebapi/Test/Mftf/README.md |   3 +
 .../SwaggerWebapi/Test/Mftf/composer.json     |  17 +
 .../SwaggerWebapiAsync/Test/Mftf}/LICENSE.txt |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../SwaggerWebapiAsync/Test/Mftf/README.md    |   3 +
 .../Test/Mftf/composer.json                   |  19 +
 .../Magento/Swatches/Test/Mftf}/LICENSE.txt   |   0
 .../Swatches/Test/Mftf}/LICENSE_AFL.txt       |   0
 app/code/Magento/Swatches/Test/Mftf/README.md |   3 +
 .../Magento/Swatches/Test/Mftf/composer.json  |  28 +
 .../SwatchesGraphQl/Test/Mftf/README.md       |   3 +
 .../SwatchesGraphQl/Test/Mftf/composer.json   |  21 +
 .../Test/Mftf}/LICENSE.txt                    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../Test/Mftf/README.md                       |   3 +
 .../Test/Mftf/composer.json                   |  17 +
 .../Mftf}/ActionGroup/AdminTaxActionGroup.xml |   2 +-
 .../Tax/Test/Mftf}/Data/TaxCodeData.xml       |   2 +-
 .../code/Magento/Tax/Test/Mftf}/LICENSE.txt   |   0
 .../Magento/Tax/Test/Mftf}/LICENSE_AFL.txt    |   0
 .../Test/Mftf}/Page/AdminNewTaxRulePage.xml   |   2 +-
 .../Mftf}/Page/AdminTaxConfigurationPage.xml  |   2 +-
 .../Test/Mftf}/Page/AdminTaxRateGridPage.xml  |   2 +-
 .../Test/Mftf}/Page/AdminTaxRuleGridPage.xml  |   2 +-
 app/code/Magento/Tax/Test/Mftf/README.md      |   3 +
 .../Section/AdminConfigureTaxSection.xml      |   2 +-
 .../Mftf}/Section/AdminTaxRulesSection.xml    |   2 +-
 .../Mftf}/Test/StorefrontTaxQuoteCartTest.xml | 916 +++++++++---------
 .../Test/StorefrontTaxQuoteCheckoutTest.xml   | 916 +++++++++---------
 app/code/Magento/Tax/Test/Mftf/composer.json  |  32 +
 .../Magento/TaxGraphQl/Test/Mftf/README.md    |   3 +
 .../TaxGraphQl/Test/Mftf/composer.json        |  20 +
 .../TaxImportExport/Test/Mftf}/LICENSE.txt    |   0
 .../Test/Mftf}/LICENSE_AFL.txt                |   0
 .../TaxImportExport/Test/Mftf/README.md       |   3 +
 .../TaxImportExport/Test/Mftf/composer.json   |  20 +
 .../code/Magento/Theme/Test/Mftf}/LICENSE.txt |   0
 .../Magento/Theme/Test/Mftf}/LICENSE_AFL.txt  |   0
 .../Theme/Test/Mftf}/Page/ThemesPage.xml      |   2 +-
 app/code/Magento/Theme/Test/Mftf/README.md    |   3 +
 .../Test/Mftf}/Section/AdminThemeSection.xml  |   2 +-
 .../Mftf}/Section/StorefrontFooterSection.xml |   2 +-
 .../Section/StorefrontMessagesSection.xml     |   2 +-
 .../Theme/Test/Mftf}/Test/ThemeTest.xml       |   2 +-
 .../Magento/Theme/Test/Mftf/composer.json     |  32 +
 .../Magento/Tinymce3/Test/Mftf}/LICENSE.txt   |   0
 .../Tinymce3/Test/Mftf}/LICENSE_AFL.txt       |   0
 app/code/Magento/Tinymce3/Test/Mftf/README.md |   3 +
 .../Section/AdminTinymce3FileldsSection.xml   |   2 +-
 .../Test/AdminSwitchWYSIWYGOptionsTest.xml    |   2 +-
 .../Magento/Tinymce3/Test/Mftf/composer.json  |  22 +
 .../Translation/Test/Mftf}/LICENSE.txt        |   0
 .../Translation/Test/Mftf}/LICENSE_AFL.txt    |   0
 .../Magento/Translation/Test/Mftf/README.md   |   3 +
 .../Translation/Test/Mftf/composer.json       |  22 +
 .../AdminDataGridFilterActionGroup.xml        |   2 +-
 .../AdminDataGridPaginationActionGroup.xml    |   2 +-
 ...dminGridFilterSearchResultsActionGroup.xml |   2 +-
 .../AdminSaveAndCloseActionGroup.xml          |   2 +-
 .../code/Magento/Ui/Test/Mftf}/LICENSE.txt    |   0
 .../Magento/Ui/Test/Mftf}/LICENSE_AFL.txt     |   0
 app/code/Magento/Ui/Test/Mftf/README.md       |   3 +
 .../Section/AdminDataGridHeaderSection.xml    |   2 +-
 .../AdminDataGridPaginationSection.xml        |   2 +-
 .../Section/AdminDataGridTableSection.xml     |   2 +-
 .../Section/AdminGridControlsSection.xml      |   2 +-
 .../Section/ModalConfirmationSection.xml      |   2 +-
 app/code/Magento/Ui/Test/Mftf/composer.json   |  24 +
 .../code/Magento/Ups/Test/Mftf}/LICENSE.txt   |   0
 .../Magento/Ups/Test/Mftf}/LICENSE_AFL.txt    |   0
 app/code/Magento/Ups/Test/Mftf/README.md      |   3 +
 app/code/Magento/Ups/Test/Mftf/composer.json  |  26 +
 .../Magento/UrlRewrite/Test/Mftf}/LICENSE.txt |   0
 .../UrlRewrite/Test/Mftf}/LICENSE_AFL.txt     |   0
 .../Magento/UrlRewrite/Test/Mftf/README.md    |   3 +
 .../UrlRewrite/Test/Mftf/composer.json        |  22 +
 .../UrlRewriteGraphQl/Test/Mftf/README.md     |   3 +
 .../UrlRewriteGraphQl/Test/Mftf/composer.json |  21 +
 .../AdminCreateUserActionGroup.xml            |   2 +-
 .../Magento/User/Test/Mftf}/Data/UserData.xml |   2 +-
 .../User/Test/Mftf}/Data/UserRoleData.xml     |   2 +-
 .../code/Magento/User/Test/Mftf}/LICENSE.txt  |   0
 .../Magento/User/Test/Mftf}/LICENSE_AFL.txt   |   0
 .../Test/Mftf}/Page/AdminEditRolePage.xml     |   2 +-
 .../Test/Mftf}/Page/AdminEditUserPage.xml     |   2 +-
 .../User/Test/Mftf}/Page/AdminRolesPage.xml   |   2 +-
 .../User/Test/Mftf}/Page/AdminUsersPage.xml   |   2 +-
 app/code/Magento/User/Test/Mftf/README.md     |   3 +
 .../Section/AdminEditRoleInfoSection.xml      |   2 +-
 .../Section/AdminEditUserRoleSection.xml      |   2 +-
 .../Mftf}/Section/AdminEditUserSection.xml    |   2 +-
 .../Mftf}/Section/AdminRoleGridSection.xml    |   2 +-
 .../Mftf}/Section/AdminUserGridSection.xml    |   2 +-
 app/code/Magento/User/Test/Mftf/composer.json |  22 +
 .../code/Magento/Usps/Test/Mftf}/LICENSE.txt  |   0
 .../Magento/Usps/Test/Mftf}/LICENSE_AFL.txt   |   0
 app/code/Magento/Usps/Test/Mftf/README.md     |   3 +
 app/code/Magento/Usps/Test/Mftf/composer.json |  24 +
 .../CreateCustomVariableActionGroup.xml       |   2 +-
 .../Variable/Test/Mftf}/Data/VariableData.xml |   2 +-
 .../Magento/Variable/Test/Mftf}/LICENSE.txt   |   0
 .../Variable/Test/Mftf}/LICENSE_AFL.txt       |   0
 app/code/Magento/Variable/Test/Mftf/README.md |   3 +
 .../Magento/Variable/Test/Mftf/composer.json  |  19 +
 .../code/Magento/Vault/Test/Mftf}/LICENSE.txt |   0
 .../Magento/Vault/Test/Mftf}/LICENSE_AFL.txt  |   0
 app/code/Magento/Vault/Test/Mftf/README.md    |   3 +
 .../Magento/Vault/Test/Mftf/composer.json     |  21 +
 .../Magento/Version/Test/Mftf}/LICENSE.txt    |   0
 .../Version/Test/Mftf}/LICENSE_AFL.txt        |   0
 app/code/Magento/Version/Test/Mftf/README.md  |   3 +
 .../Magento/Version/Test/Mftf/composer.json   |  16 +
 .../Magento/Webapi/Test/Mftf}/LICENSE.txt     |   0
 .../Magento/Webapi/Test/Mftf}/LICENSE_AFL.txt |   0
 app/code/Magento/Webapi/Test/Mftf/README.md   |   3 +
 .../Magento/Webapi/Test/Mftf/composer.json    |  24 +
 .../WebapiAsync/Test/Mftf}/LICENSE.txt        |   0
 .../WebapiAsync/Test/Mftf}/LICENSE_AFL.txt    |   0
 .../Magento/WebapiAsync/Test/Mftf/README.md   |   3 +
 .../WebapiAsync/Test/Mftf/composer.json       |  22 +
 .../WebapiSecurity/Test/Mftf}/LICENSE.txt     |   0
 .../WebapiSecurity/Test/Mftf}/LICENSE_AFL.txt |   0
 .../WebapiSecurity/Test/Mftf/README.md        |   3 +
 .../WebapiSecurity/Test/Mftf/composer.json    |  17 +
 .../code/Magento/Weee/Test/Mftf}/LICENSE.txt  |   0
 .../Magento/Weee/Test/Mftf}/LICENSE_AFL.txt   |   0
 app/code/Magento/Weee/Test/Mftf/README.md     |   3 +
 app/code/Magento/Weee/Test/Mftf/composer.json |  31 +
 .../Magento/WeeeGraphQl/Test/Mftf/README.md   |   3 +
 .../WeeeGraphQl/Test/Mftf/composer.json       |  20 +
 .../Magento/Widget/Test/Mftf}/LICENSE.txt     |   0
 .../Magento/Widget/Test/Mftf}/LICENSE_AFL.txt |   0
 app/code/Magento/Widget/Test/Mftf/README.md   |   3 +
 .../Magento/Widget/Test/Mftf/composer.json    |  25 +
 .../StorefrontCustomerWishlistActionGroup.xml |   2 +-
 .../Wishlist/Test/Mftf}/Data/WishlistData.xml |   2 +-
 .../Magento/Wishlist/Test/Mftf/LICENSE.txt    |  48 +
 .../Wishlist/Test/Mftf/LICENSE_AFL.txt        |  48 +
 .../Test/Mftf}/Metadata/wishlist-meta.xml     |   2 +-
 .../Page/StorefrontCustomerWishlistPage.xml   |   2 +-
 app/code/Magento/Wishlist/Test/Mftf/README.md |   3 +
 .../StorefrontCategoryProductSection.xml      |   2 +-
 ...orefrontCustomerWishlistProductSection.xml |   2 +-
 .../StorefrontCustomerWishlistSection.xml     |   2 +-
 ...orefrontCustomerWishlistSidebarSection.xml |   2 +-
 .../StorefrontProductInfoMainSection.xml      |   2 +-
 .../Test/EndToEndB2CLoggedInUserTest.xml      |   2 +-
 ...AddMultipleStoreProductsToWishlistTest.xml |   2 +-
 .../StorefrontDeletePersistedWishlistTest.xml |   2 +-
 .../Magento/Wishlist/Test/Mftf/composer.json  |  33 +
 .../WishlistAnalytics/Test/Mftf/LICENSE.txt   |  48 +
 .../Test/Mftf/LICENSE_AFL.txt                 |  48 +
 .../WishlistAnalytics/Test/Mftf/README.md     |   3 +
 .../WishlistAnalytics/Test/Mftf/composer.json |  17 +
 .../AdminNotification/README.md               |   3 -
 .../AdminNotification/composer.json           |  36 -
 .../AdvancedPricingImportExport/README.md     |   3 -
 .../AdvancedPricingImportExport/composer.json |  39 -
 .../FunctionalTest/AdvancedSearch/README.md   |   3 -
 .../AdvancedSearch/composer.json              |  38 -
 .../Magento/FunctionalTest/Amqp/README.md     |   3 -
 .../Magento/FunctionalTest/Amqp/composer.json |  29 -
 .../FunctionalTest/Analytics/README.md        |   3 -
 .../FunctionalTest/Analytics/composer.json    |  36 -
 .../AsynchronousOperations/README.md          |   3 -
 .../AsynchronousOperations/composer.json      |  36 -
 .../FunctionalTest/Authorization/README.md    |   3 -
 .../Authorization/composer.json               |  33 -
 .../FunctionalTest/Authorizenet/README.md     |   3 -
 .../FunctionalTest/Authorizenet/composer.json |  39 -
 .../Magento/FunctionalTest/Backend/README.md  |   3 -
 .../FunctionalTest/Backend/composer.json      |  48 -
 .../Magento/FunctionalTest/Backup/README.md   |   3 -
 .../FunctionalTest/Backup/composer.json       |  35 -
 .../FunctionalTest/Braintree/README.md        |   3 -
 .../FunctionalTest/Braintree/composer.json    |  45 -
 .../Magento/FunctionalTest/Bundle/README.md   |   3 -
 .../FunctionalTest/Bundle/composer.json       |  47 -
 .../BundleImportExport/README.md              |   3 -
 .../BundleImportExport/composer.json          |  37 -
 .../FunctionalTest/CacheInvalidate/README.md  |   3 -
 .../CacheInvalidate/composer.json             |  33 -
 .../Magento/FunctionalTest/Captcha/README.md  |   3 -
 .../FunctionalTest/Captcha/composer.json      |  36 -
 .../Magento/FunctionalTest/Catalog/README.md  |   3 -
 .../FunctionalTest/Catalog/composer.json      |  56 --
 .../FunctionalTest/CatalogAnalytics/README.md |   3 -
 .../CatalogAnalytics/composer.json            |  33 -
 .../CatalogImportExport/README.md             |   3 -
 .../CatalogImportExport/composer.json         |  41 -
 .../FunctionalTest/CatalogInventory/README.md |   3 -
 .../CatalogInventory/composer.json            |  39 -
 .../FunctionalTest/CatalogRule/README.md      |   3 -
 .../FunctionalTest/CatalogRule/composer.json  |  39 -
 .../CatalogRuleConfigurable/README.md         |   3 -
 .../CatalogRuleConfigurable/composer.json     |  35 -
 .../FunctionalTest/CatalogSearch/README.md    |   3 -
 .../CatalogSearch/composer.json               |  42 -
 .../CatalogUrlRewrite/README.md               |   3 -
 .../CatalogUrlRewrite/composer.json           |  40 -
 .../FunctionalTest/CatalogWidget/README.md    |   3 -
 .../CatalogWidget/composer.json               |  40 -
 .../Magento/FunctionalTest/Checkout/README.md |   3 -
 .../FunctionalTest/Checkout/composer.json     |  50 -
 .../CheckoutAgreements/README.md              |   3 -
 .../CheckoutAgreements/composer.json          |  36 -
 .../Magento/FunctionalTest/Cms/README.md      |   3 -
 .../Magento/FunctionalTest/Cms/composer.json  |  41 -
 .../FunctionalTest/CmsUrlRewrite/README.md    |   3 -
 .../CmsUrlRewrite/composer.json               |  35 -
 .../Magento/FunctionalTest/Config/README.md   |   3 -
 .../FunctionalTest/Config/composer.json       |  39 -
 .../ConfigurableImportExport/README.md        |   3 -
 .../ConfigurableImportExport/composer.json    |  37 -
 .../ConfigurableProduct/README.md             |   3 -
 .../ConfigurableProduct/composer.json         |  43 -
 .../ConfigurableProductSales/README.md        |   3 -
 .../ConfigurableProductSales/composer.json    |  35 -
 .../Magento/FunctionalTest/Contact/README.md  |   3 -
 .../FunctionalTest/Contact/composer.json      |  36 -
 .../Magento/FunctionalTest/Cookie/README.md   |   3 -
 .../FunctionalTest/Cookie/composer.json       |  33 -
 .../Magento/FunctionalTest/Cron/README.md     |   3 -
 .../Magento/FunctionalTest/Cron/composer.json |  33 -
 .../FunctionalTest/CurrencySymbol/README.md   |   3 -
 .../CurrencySymbol/composer.json              |  37 -
 .../Magento/FunctionalTest/Customer/README.md |   3 -
 .../FunctionalTest/Customer/composer.json     |  51 -
 .../CustomerAnalytics/README.md               |   3 -
 .../CustomerAnalytics/composer.json           |  33 -
 .../CustomerImportExport/README.md            |   3 -
 .../CustomerImportExport/composer.json        |  38 -
 .../Magento/FunctionalTest/Deploy/README.md   |   3 -
 .../FunctionalTest/Deploy/composer.json       |  36 -
 .../FunctionalTest/Developer/README.md        |   3 -
 .../FunctionalTest/Developer/composer.json    |  34 -
 .../Magento/FunctionalTest/Dhl/README.md      |   3 -
 .../Magento/FunctionalTest/Dhl/composer.json  |  41 -
 .../FunctionalTest/Directory/README.md        |   3 -
 .../FunctionalTest/Directory/composer.json    |  35 -
 .../FunctionalTest/Downloadable/README.md     |   3 -
 .../FunctionalTest/Downloadable/composer.json |  48 -
 .../DownloadableImportExport/README.md        |   3 -
 .../DownloadableImportExport/composer.json    |  38 -
 .../Magento/FunctionalTest/Eav/README.md      |   3 -
 .../Magento/FunctionalTest/Eav/composer.json  |  37 -
 .../FunctionalTest/Elasticsearch/README.md    |   3 -
 .../Elasticsearch/composer.json               |  38 -
 .../Magento/FunctionalTest/Email/README.md    |   3 -
 .../FunctionalTest/Email/composer.json        |  38 -
 .../FunctionalTest/EncryptionKey/README.md    |   3 -
 .../EncryptionKey/composer.json               |  34 -
 .../Magento/FunctionalTest/Fedex/README.md    |   3 -
 .../FunctionalTest/Fedex/composer.json        |  40 -
 .../FunctionalTest/GiftMessage/README.md      |   3 -
 .../FunctionalTest/GiftMessage/composer.json  |  40 -
 .../FunctionalTest/GoogleAdwords/README.md    |   3 -
 .../GoogleAdwords/composer.json               |  34 -
 .../FunctionalTest/GoogleAnalytics/README.md  |   3 -
 .../GoogleAnalytics/composer.json             |  35 -
 .../FunctionalTest/GoogleOptimizer/README.md  |   3 -
 .../GoogleOptimizer/composer.json             |  38 -
 .../Magento/FunctionalTest/GraphQl/README.md  |   3 -
 .../FunctionalTest/GraphQl/composer.json      |  35 -
 .../GroupedImportExport/README.md             |   3 -
 .../GroupedImportExport/composer.json         |  37 -
 .../FunctionalTest/GroupedProduct/README.md   |   3 -
 .../GroupedProduct/composer.json              |  44 -
 .../FunctionalTest/ImportExport/README.md     |   3 -
 .../FunctionalTest/ImportExport/composer.json |  37 -
 .../Magento/FunctionalTest/Indexer/README.md  |   3 -
 .../FunctionalTest/Indexer/composer.json      |  33 -
 .../FunctionalTest/InstantPurchase/README.md  |   3 -
 .../InstantPurchase/composer.json             |  38 -
 .../FunctionalTest/Integration/README.md      |   3 -
 .../FunctionalTest/Integration/composer.json  |  38 -
 .../LayeredNavigation/README.md               |   3 -
 .../LayeredNavigation/composer.json           |  34 -
 .../FunctionalTest/Marketplace/README.md      |   3 -
 .../FunctionalTest/Marketplace/composer.json  |  33 -
 .../FunctionalTest/MediaStorage/README.md     |   3 -
 .../FunctionalTest/MediaStorage/composer.json |  35 -
 .../FunctionalTest/MessageQueue/README.md     |   3 -
 .../FunctionalTest/MessageQueue/composer.json |  29 -
 .../Magento/FunctionalTest/Msrp/README.md     |   3 -
 .../Magento/FunctionalTest/Msrp/composer.json |  38 -
 .../FunctionalTest/Multishipping/README.md    |   3 -
 .../Multishipping/composer.json               |  40 -
 .../Magento/FunctionalTest/MysqlMq/README.md  |   3 -
 .../FunctionalTest/MysqlMq/composer.json      |  32 -
 .../NewRelicReporting/README.md               |   3 -
 .../NewRelicReporting/composer.json           |  38 -
 .../FunctionalTest/Newsletter/README.md       |   3 -
 .../FunctionalTest/Newsletter/composer.json   |  40 -
 .../FunctionalTest/OfflinePayments/README.md  |   3 -
 .../OfflinePayments/composer.json             |  34 -
 .../FunctionalTest/OfflineShipping/README.md  |   3 -
 .../OfflineShipping/composer.json             |  41 -
 .../FunctionalTest/PageCache/README.md        |   3 -
 .../FunctionalTest/PageCache/composer.json    |  35 -
 .../Magento/FunctionalTest/Payment/README.md  |   3 -
 .../FunctionalTest/Payment/composer.json      |  38 -
 .../Magento/FunctionalTest/Paypal/README.md   |   3 -
 .../FunctionalTest/Paypal/composer.json       |  48 -
 .../FunctionalTest/Persistent/README.md       |   3 -
 .../FunctionalTest/Persistent/composer.json   |  38 -
 .../FunctionalTest/ProductAlert/README.md     |   3 -
 .../FunctionalTest/ProductAlert/composer.json |  36 -
 .../FunctionalTest/ProductVideo/README.md     |   3 -
 .../FunctionalTest/ProductVideo/composer.json |  37 -
 .../Magento/FunctionalTest/Quote/README.md    |   3 -
 .../FunctionalTest/Quote/composer.json        |  46 -
 .../FunctionalTest/QuoteAnalytics/README.md   |   3 -
 .../QuoteAnalytics/composer.json              |  33 -
 .../Magento/FunctionalTest/Reports/README.md  |   3 -
 .../FunctionalTest/Reports/composer.json      |  48 -
 .../FunctionalTest/RequireJs/README.md        |   3 -
 .../FunctionalTest/RequireJs/composer.json    |  30 -
 .../Magento/FunctionalTest/Review/README.md   |   3 -
 .../FunctionalTest/Review/composer.json       |  40 -
 .../FunctionalTest/ReviewAnalytics/README.md  |   3 -
 .../ReviewAnalytics/composer.json             |  33 -
 .../Magento/FunctionalTest/Robots/README.md   |   3 -
 .../FunctionalTest/Robots/composer.json       |  33 -
 .../Magento/FunctionalTest/Rss/README.md      |   3 -
 .../Magento/FunctionalTest/Rss/composer.json  |  35 -
 .../Magento/FunctionalTest/Rule/README.md     |   3 -
 .../Magento/FunctionalTest/Rule/composer.json |  36 -
 .../Magento/FunctionalTest/Sales/README.md    |   3 -
 .../FunctionalTest/Sales/composer.json        |  55 --
 .../FunctionalTest/SalesAnalytics/README.md   |   3 -
 .../SalesAnalytics/composer.json              |  33 -
 .../FunctionalTest/SalesInventory/README.md   |   3 -
 .../SalesInventory/composer.json              |  36 -
 .../FunctionalTest/SalesRule/README.md        |   3 -
 .../FunctionalTest/SalesRule/composer.json    |  48 -
 .../FunctionalTest/SalesSequence/README.md    |   3 -
 .../SalesSequence/composer.json               |  30 -
 .../FunctionalTest/SampleData/README.md       |   3 -
 .../FunctionalTest/SampleData/composer.json   |  30 -
 .../Magento/FunctionalTest/Search/README.md   |   3 -
 .../FunctionalTest/Search/composer.json       |  37 -
 .../Magento/FunctionalTest/Security/README.md |   3 -
 .../FunctionalTest/Security/composer.json     |  34 -
 .../FunctionalTest/SendFriend/README.md       |   3 -
 .../FunctionalTest/SendFriend/composer.json   |  35 -
 .../Magento/FunctionalTest/Shipping/README.md |   3 -
 .../FunctionalTest/Shipping/composer.json     |  45 -
 .../Magento/FunctionalTest/Sitemap/README.md  |   3 -
 .../FunctionalTest/Sitemap/composer.json      |  41 -
 .../Magento/FunctionalTest/Store/README.md    |   3 -
 .../FunctionalTest/Store/composer.json        |  37 -
 .../Magento/FunctionalTest/Swagger/README.md  |   3 -
 .../FunctionalTest/Swagger/composer.json      |  30 -
 .../Magento/FunctionalTest/Swatches/README.md |   3 -
 .../FunctionalTest/Swatches/composer.json     |  41 -
 .../SwatchesLayeredNavigation/README.md       |   3 -
 .../SwatchesLayeredNavigation/composer.json   |  30 -
 .../Magento/FunctionalTest/Tax/README.md      |   3 -
 .../Magento/FunctionalTest/Tax/composer.json  |  45 -
 .../FunctionalTest/TaxImportExport/README.md  |   3 -
 .../TaxImportExport/composer.json             |  36 -
 .../Magento/FunctionalTest/Theme/README.md    |   3 -
 .../FunctionalTest/Theme/composer.json        |  42 -
 .../Magento/FunctionalTest/Tinymce3/README.md |   3 -
 .../FunctionalTest/Tinymce3/composer.json     |  35 -
 .../FunctionalTest/Translation/README.md      |   3 -
 .../FunctionalTest/Translation/composer.json  |  35 -
 .../Magento/FunctionalTest/Ui/README.md       |   3 -
 .../Magento/FunctionalTest/Ui/composer.json   |  36 -
 .../Magento/FunctionalTest/Ups/README.md      |   3 -
 .../Magento/FunctionalTest/Ups/composer.json  |  39 -
 .../FunctionalTest/UrlRewrite/README.md       |   3 -
 .../FunctionalTest/UrlRewrite/composer.json   |  38 -
 .../Magento/FunctionalTest/User/README.md     |   3 -
 .../Magento/FunctionalTest/User/composer.json |  38 -
 .../Magento/FunctionalTest/Usps/README.md     |   3 -
 .../Magento/FunctionalTest/Usps/composer.json |  40 -
 .../Magento/FunctionalTest/Variable/README.md |   3 -
 .../FunctionalTest/Variable/composer.json     |  35 -
 .../Magento/FunctionalTest/Vault/README.md    |   3 -
 .../FunctionalTest/Vault/composer.json        |  38 -
 .../Magento/FunctionalTest/Version/README.md  |   3 -
 .../FunctionalTest/Version/composer.json      |  30 -
 .../Magento/FunctionalTest/Webapi/README.md   |   3 -
 .../FunctionalTest/Webapi/composer.json       |  36 -
 .../FunctionalTest/WebapiSecurity/README.md   |   3 -
 .../WebapiSecurity/composer.json              |  33 -
 .../Magento/FunctionalTest/Weee/README.md     |   3 -
 .../Magento/FunctionalTest/Weee/composer.json |  44 -
 .../Magento/FunctionalTest/Widget/README.md   |   3 -
 .../FunctionalTest/Widget/composer.json       |  39 -
 .../Magento/FunctionalTest/Wishlist/README.md |   3 -
 .../FunctionalTest/Wishlist/composer.json     |  42 -
 .../WishlistAnalytics/README.md               |   3 -
 .../WishlistAnalytics/composer.json           |  33 -
 .../Magento/Test/Integrity/Xml/SchemaTest.php |   3 +-
 1431 files changed, 5786 insertions(+), 6875 deletions(-)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification => app/code/Magento/AdminNotification/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification => app/code/Magento/AdminNotification/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/AdminNotification/Test/Mftf/README.md
 create mode 100644 app/code/Magento/AdminNotification/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport => app/code/Magento/AdvancedPricingImportExport/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport => app/code/Magento/AdvancedPricingImportExport/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/AdvancedPricingImportExport/Test/Mftf/README.md
 create mode 100644 app/code/Magento/AdvancedPricingImportExport/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch => app/code/Magento/AdvancedSearch/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch => app/code/Magento/AdvancedSearch/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/AdvancedSearch/Test/Mftf/README.md
 create mode 100644 app/code/Magento/AdvancedSearch/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp => app/code/Magento/Amqp/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp => app/code/Magento/Amqp/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Amqp/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Amqp/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics => app/code/Magento/Analytics/Test/Mftf}/Data/UserData.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics => app/code/Magento/Analytics/Test/Mftf}/Data/UserRoleData.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics => app/code/Magento/Analytics/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics => app/code/Magento/Analytics/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics => app/code/Magento/Analytics/Test/Mftf}/Metadata/user-meta.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics => app/code/Magento/Analytics/Test/Mftf}/Metadata/user_role-meta.xml (77%)
 create mode 100644 app/code/Magento/Analytics/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics => app/code/Magento/Analytics/Test/Mftf}/Test/AdminConfigurationBlankIndustryTest.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics => app/code/Magento/Analytics/Test/Mftf}/Test/AdminConfigurationEnableDisableAnalyticsTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics => app/code/Magento/Analytics/Test/Mftf}/Test/AdminConfigurationIndustryTest.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics => app/code/Magento/Analytics/Test/Mftf}/Test/AdminConfigurationPermissionTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics => app/code/Magento/Analytics/Test/Mftf}/Test/AdminConfigurationTimeToSendDataTest.xml (90%)
 create mode 100644 app/code/Magento/Analytics/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/AsynchronousOperations/Test/Mftf/README.md
 create mode 100644 app/code/Magento/AsynchronousOperations/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization => app/code/Magento/Authorization/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization => app/code/Magento/Authorization/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Authorization/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Authorization/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet => app/code/Magento/Authorizenet/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet => app/code/Magento/Authorizenet/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Authorizenet/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Authorizenet/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/ActionGroup/LoginActionGroup.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/ActionGroup/LoginAsAdminActionGroup.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/ActionGroup/LogoutActionGroup.xml (63%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/ActionGroup/SecondaryGridActionGroup.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/ActionGroup/SortByIdDescendingActionGroup.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Data/BackenedData.xml (61%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Page/AdminConfigurationStoresPage.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Page/AdminLoginPage.xml (64%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Page/AdminLogoutPage.xml (61%)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Section/AdminConfirmationModalSection.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Section/AdminGridTableSection.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Section/AdminHeaderSection.xml (64%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Section/AdminLoginFormSection.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Section/AdminMainActionsSection.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Section/AdminMessagesSection.xml (64%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Section/AdminSecondaryGridSection.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend => app/code/Magento/Backend/Test/Mftf}/Test/AdminLoginTest.xml (87%)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup => app/code/Magento/Backup/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup => app/code/Magento/Backup/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Backup/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Backup/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree => app/code/Magento/Braintree/Test/Mftf}/Data/BraintreeData.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree => app/code/Magento/Braintree/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree => app/code/Magento/Braintree/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree => app/code/Magento/Braintree/Test/Mftf}/Metadata/braintree_config-meta.xml (91%)
 create mode 100644 app/code/Magento/Braintree/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Braintree/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/ActionGroup/AdminBundleProductActionGroup.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/ActionGroup/AdminClearFiltersActionGroup.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/ActionGroup/BundleProductFilterActionGroup.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/ActionGroup/CreateBundleProductActionGroup.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/ActionGroup/EnableDisableProductActionGroup.xml (90%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Data/BundleLinkData.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Data/BundleOptionData.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Data/CustomAttributeData.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Data/ProductData.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Metadata/bundle_link-meta.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Metadata/bundle_option-meta.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Metadata/bundle_options-meta.xml (68%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Page/AdminCatalogProductPage.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Page/AdminProductCreatePage.xml (69%)
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Section/AdminProductFormBundleSection.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Section/BundleStorefrontSection.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Section/StorefrontBundledSection.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/AdminAddBundleItemsTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/AdminAddDefaultImageBundleProductTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/AdminAttributeSetSelectionTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/AdminDeleteABundleProduct.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/AdminFilterProductListByBundleProduct.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/AdminMassDeleteBundleProducts.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/AdminProductBundleCreationTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/AdminRemoveDefaultImageBundleProductTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/BundleProductFixedPricingTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/EnableDisableBundleProductStatusTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/EndToEndB2CAdminTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/MassEnableDisableBundleProductsTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/NewBundleProductSelectionTest.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/StorefrontAdminEditDataTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle => app/code/Magento/Bundle/Test/Mftf}/Test/StorefrontEditBundleProductTest.xml (96%)
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/BundleGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/BundleGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport => app/code/Magento/BundleImportExport/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport => app/code/Magento/BundleImportExport/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/BundleImportExport/Test/Mftf/README.md
 create mode 100644 app/code/Magento/BundleImportExport/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate => app/code/Magento/CacheInvalidate/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate => app/code/Magento/CacheInvalidate/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/CacheInvalidate/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CacheInvalidate/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha => app/code/Magento/Captcha/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha => app/code/Magento/Captcha/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Captcha/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/AddProductToCartActionGroup.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/AdminCategoryActionGroup.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/AdminCreateRootCategoryActionGroup.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/AdminProductActionGroup.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/AdminProductAttributeActionGroup.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/AdminProductAttributeSetActionGroup.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/AdminProductGridActionGroup.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/CustomOptionsActionGroup.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/MoveCategoryActionGroup.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/OpenEditProductOnBackendActionGroup.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/OpenProductFromCategoryPageActionGroup.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/RestoreLayoutSettingActionGroup.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/SearchAndMultiselectActionGroup.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/SearchForProductOnBackendActionGroup.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/StorefrontCategoryActionGroup.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/StorefrontCompareActionGroup.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/StorefrontProductActionGroup.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/ActionGroup/StorefrontProductPageActionGroup.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/CategoryData.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/ConstData.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/CustomAttributeData.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/FrontendLabelData.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/ImageContentData.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/ProductAttributeData.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/ProductAttributeMediaGalleryEntryData.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/ProductAttributeOptionData.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/ProductAttributeSetData.xml (70%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/ProductData.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/ProductExtensionAttributeData.xml (63%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/ProductGridData.xml (62%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/ProductOptionData.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/ProductOptionValueData.xml (90%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/StockItemData.xml (63%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Data/StoreLabelData.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/category-meta.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/custom_attribute-meta.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/empty_extension_attribute-meta.xml (69%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/frontend_label-meta.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/product-meta.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/product_attribute-meta.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/product_attribute_media_gallery_entry-meta.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/product_attribute_option-meta.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/product_attribute_set-meta.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/product_extension_attribute-meta.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/product_link-meta.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/product_link_extension_attribute-meta.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/product_links-meta.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/product_option-meta.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/product_option_value-meta.xml (82%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/stock_item-meta.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/store_label-meta.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Metadata/validation_rule-meta.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/AdminCategoryEditPage.xml (82%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/AdminCategoryPage.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/AdminProductAttributeFormPage.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/AdminProductAttributeGridPage.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/AdminProductAttributeSetEditPage.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/AdminProductAttributeSetGridPage.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/AdminProductAttributesEditPage.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/AdminProductCreatePage.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/AdminProductEditPage.xml (70%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/AdminProductIndexPage.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/ProductCatalogPage.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/StorefrontCategoryPage.xml (69%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/StorefrontProductComparePage.xml (68%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Page/StorefrontProductPage.xml (77%)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminAddProductsToOptionPanelSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCategoryBasicFieldSection.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCategoryContentSection.xml (82%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCategoryMainActionsSection.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCategoryMessagesSection.xml (64%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCategoryModalSection.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCategoryProductsGridSection.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCategoryProductsSection.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCategorySEOSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCategorySidebarActionSection.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCategorySidebarTreeSection.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCategoryWarningMessagesPopupSection.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminCreateProductAttributeSection.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminEditProductAttributesSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductAttributeGridSection.xml (82%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductAttributeSetActionSection.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductAttributeSetEditSection.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductAttributeSetGridSection.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductAttributeSetSection.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductCategoryCreationSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductContentSection.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductCustomizableOptionsSection.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductFiltersSection.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductFormActionSection.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductFormChangeStoreSection.xml (72%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductFormSection.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductGridActionSection.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductGridConfirmActionSection.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductGridFilterSection.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductGridPaginationSection.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductGridSection.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductGridTableHeaderSection.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductImagesSection.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductMessagesSection.xml (69%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductModalSlideGridSection.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductRelatedUpSellCrossSellSection.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminProductSEOSection.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/AdminUpdateAttributesSection.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontCategoryFilterSection.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontCategoryMainSection.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontCategoryProductSection.xml (90%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontCategorySidebarSection.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontComparisonSidebarSection.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontFooterSection.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontHeaderSection.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontMessagesSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontNavigationSection.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontProducRelatedProductsSection.xml (82%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontProductActionSection.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontProductCompareMainSection.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontProductInfoDetailsSection.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontProductInfoMainSection.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontProductMediaSection.xml (68%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontProductMoreInformationSection.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Section/StorefrontProductPageSection.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminAddDefaultImageSimpleProductTest.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminAddDefaultImageVirtualProductTest.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminAddImageForCategoryTest.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminAddImageToWYSIWYGCatalogTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminAddImageToWYSIWYGProductTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminAssignProductAttributeToAttributeSetTest.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminCreateCategoryFromProductPageTest.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminCreateCategoryTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminCreateProductCustomAttributeSet.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminCreateProductDuplicateUrlkeyTest.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminCreateSimpleProductTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminCreateSimpleProductWithUnicodeTest.xml (90%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminEditTextEditorProductAttributeTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminMassChangeProductsStatusTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminMoveAnchoredCategoryTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminProductGridFilteringByDateAttributeTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminRemoveDefaultImageSimpleProductTest.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminRemoveDefaultImageVirtualProductTest.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminRemoveImageFromCategoryTest.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminSimpleProductImagesTest.xml (99%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdminUpdateCategoryStoreUrlKeyTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/AdvanceCatalogSearchSimpleProductTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/ConfigurableOptionTextInputLengthValidationHint.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/DeleteCategoriesTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/EndToEndB2CAdminTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/EndToEndB2CGuestUserTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/EndToEndB2CLoggedInUserTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/SimpleProductTwoCustomOptionsTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/StorefrontProductNameWithDoubleQuote.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/StorefrontProductWithEmptyAttributeTest.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/StorefrontPurchaseProductWithCustomOptions.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog => app/code/Magento/Catalog/Test/Mftf}/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml (96%)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics => app/code/Magento/CatalogAnalytics/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics => app/code/Magento/CatalogAnalytics/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/CatalogAnalytics/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CatalogAnalytics/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/CatalogGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CatalogGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport => app/code/Magento/CatalogImportExport/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport => app/code/Magento/CatalogImportExport/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/CatalogImportExport/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CatalogImportExport/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory => app/code/Magento/CatalogInventory/Test/Mftf}/ActionGroup/DisplayOutOfStockProductActionGroup.xml (90%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory => app/code/Magento/CatalogInventory/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory => app/code/Magento/CatalogInventory/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory => app/code/Magento/CatalogInventory/Test/Mftf}/Page/InventoryConfigurationPage.xml (68%)
 create mode 100644 app/code/Magento/CatalogInventory/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory => app/code/Magento/CatalogInventory/Test/Mftf}/Section/InventorySection.xml (80%)
 create mode 100644 app/code/Magento/CatalogInventory/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule => app/code/Magento/CatalogRule/Test/Mftf}/Data/CatalogRuleData.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule => app/code/Magento/CatalogRule/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule => app/code/Magento/CatalogRule/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule => app/code/Magento/CatalogRule/Test/Mftf}/Metadata/catalog-rule-meta.xml (81%)
 create mode 100644 app/code/Magento/CatalogRule/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CatalogRule/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable => app/code/Magento/CatalogRuleConfigurable/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable => app/code/Magento/CatalogRuleConfigurable/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/CatalogRuleConfigurable/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CatalogRuleConfigurable/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/ActionGroup/StorefrontCatalogSearchActionGroup.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/Data/ConstData.xml (70%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/Page/StorefrontCatalogSearchAdvancedFormPage.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/Page/StorefrontCatalogSearchAdvancedResultPage.xml (72%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/Page/StorefrontCatalogSearchPage.xml (70%)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/Section/StorefrontCatalogSearchAdvancedFormSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml (82%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/Section/StorefrontCatalogSearchMainSection.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/Section/StorefrontFooterSection.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/Test/AdvanceCatalogSearchSimpleProductTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/Test/EndToEndB2CGuestUserTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch => app/code/Magento/CatalogSearch/Test/Mftf}/Test/EndToEndB2CLoggedInUserTest.xml (97%)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite => app/code/Magento/CatalogUrlRewrite/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite => app/code/Magento/CatalogUrlRewrite/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/CatalogUrlRewrite/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CatalogUrlRewrite/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/CatalogUrlRewriteGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CatalogUrlRewriteGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget => app/code/Magento/CatalogWidget/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget => app/code/Magento/CatalogWidget/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/CatalogWidget/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CatalogWidget/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/ActionGroup/CheckoutActionGroup.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/ActionGroup/StorefrontMiniCartActionGroup.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/ActionGroup/StorefrontProductCartActionGroup.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Data/ConstData.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Data/QuoteData.xml (72%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Page/CheckoutCartPage.xml (68%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Page/CheckoutPage.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Page/CheckoutSuccessPage.xml (69%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Page/GuestCheckoutReviewAndPaymentsPage.xml (68%)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/CheckoutCartProductSection.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/CheckoutCartSummarySection.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/CheckoutHeaderSection.xml (72%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/CheckoutOrderSummarySection.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/CheckoutPaymentSection.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/CheckoutShippingGuestInfoSection.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/CheckoutShippingMethodsSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/CheckoutShippingSection.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/CheckoutSuccessMainSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/CheckoutSuccessRegisterSection.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/StoreFrontRemoveItemModalSection.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/StorefrontCategoryProductSection.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/StorefrontMessagesSection.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/StorefrontMiniCartSection.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/StorefrontProductCompareMainSection.xml (72%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Section/StorefrontProductInfoMainSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Test/CheckCheckoutSuccessPageTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Test/EndToEndB2CGuestUserTest.xml (99%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Test/EndToEndB2CLoggedInUserTest.xml (99%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Test/StorefrontCustomerCheckoutTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout => app/code/Magento/Checkout/Test/Mftf}/Test/StorefrontGuestCheckoutTest.xml (95%)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements => app/code/Magento/CheckoutAgreements/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements => app/code/Magento/CheckoutAgreements/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/CheckoutAgreements/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CheckoutAgreements/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/AssertCMSBlockContentActionGroup.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/AssertCMSPageContentActionGroup.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/AssignBlockToCMSPageActionGroup.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/CMSActionGroup.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/DeleteImageFromStorageActionGroup.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/FillOutBlockContentActionGroup.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/FillOutCMSPageContentActionGroup.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/NavigateToMediaFolderActionGroup.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/RestoreLayoutSettingActionGroup.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/SearchBlockOnGridPageActionGroup.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/SelectImageFromMediaStorageActionGroup.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/ActionGroup/VerifyTinyMCEActionGroup.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Data/BlockPageData.xml (69%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Data/CmsPageData.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Metadata/block-meta.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Metadata/cms-meta.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Page/CmsBlocksPage.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Page/CmsNewBlockPage.xml (68%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Page/CmsNewPagePage.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Page/CmsPagesPage.xml (64%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Page/StorefrontHomePage.xml (65%)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/BlockPageActionsSection.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/CmsNewBlockBlockActionsSection.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/CmsNewBlockBlockBasicFieldsSection.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/CmsNewPagePageActionsSection.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/CmsNewPagePageBasicFieldsSection.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/CmsNewPagePageContentSection.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/CmsNewPagePageSeoSection.xml (70%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/CmsPagesPageActionsSection.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/CustomVariableSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/StorefrontBlockSection.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/StorefrontCMSPageSection.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/StorefrontHeaderSection.xml (58%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Section/TinyMCESection.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddImageToWYSIWYGBlockTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddImageToWYSIWYGCMSTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddVariableToWYSIWYGBlockTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddVariableToWYSIWYGCMSTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddWidgetToWYSIWYGBlockTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminCreateCmsBlockTest.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/AdminCreateCmsPageTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms => app/code/Magento/Cms/Test/Mftf}/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml (95%)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite => app/code/Magento/CmsUrlRewrite/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite => app/code/Magento/CmsUrlRewrite/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/CmsUrlRewrite/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CmsUrlRewrite/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/CmsUrlRewriteGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CmsUrlRewriteGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/ActionGroup/ConfigAdminAccountSharingActionGroup.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/ActionGroup/ConfigWYSIWYGActionGroup.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/ActionGroup/ConfigWebUrlOptionsActionGroup.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/ActionGroup/GeneralConfigurationActionGroup.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/ActionGroup/RestoreLayoutSettingActionGroup.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/ActionGroup/SwitcherActionGroup.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/Page/AdminConfigPage.xml (75%)
 create mode 100644 app/code/Magento/Config/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/Section/AdminConfigSection.xml (90%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/Section/AdminSection.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/Section/GeneralSection.xml (90%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config => app/code/Magento/Config/Test/Mftf}/Section/StoreConfigSection.xml (76%)
 create mode 100644 app/code/Magento/Config/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport => app/code/Magento/ConfigurableImportExport/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport => app/code/Magento/ConfigurableImportExport/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/ConfigurableImportExport/Test/Mftf/README.md
 create mode 100644 app/code/Magento/ConfigurableImportExport/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/ActionGroup/AdminConfigurableProductActionGroup.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/ActionGroup/ConfigurableProductCheckoutActionGroup.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/ActionGroup/StorefrontCategoryActionGroup.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/ActionGroup/StorefrontCompareActionGroup.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/ActionGroup/StorefrontProductActionGroup.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/ActionGroup/StorefrontProductCartActionGroup.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Data/ConfigurableProductData.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Data/ConfigurableProductOptionData.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Data/ConstData.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Data/ProductConfigurableAttributeData.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Data/ValueIndexData.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Metadata/configurable_product_add_child-meta.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Metadata/configurable_product_options-meta.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Metadata/extension_attribute_configurable_product_options-meta.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Metadata/valueIndex-meta.xml (63%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Page/AdminProductCreatePage.xml (75%)
 create mode 100644 app/code/Magento/ConfigurableProduct/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Section/AdminChooseAffectedAttributeSetSection.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Section/AdminCreateProductConfigurationsPanelSection.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Section/AdminNewAttributePanelSection.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Section/AdminProductFormConfigurationsSection.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Section/AdminProductGridActionSection.xml (69%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Section/StorefrontProductInfoMainSection.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/AdminAddDefaultImageConfigurableTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/AdminConfigurableProductCreateTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/AdminConfigurableProductDeleteTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/AdminConfigurableProductOutOfStockTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/AdminConfigurableProductSearchTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/AdminConfigurableProductUpdateAttributeTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/AdminConfigurableProductUpdateTest.xml (99%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/AdminRelatedProductsTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/AdminRemoveDefaultImageConfigurableTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/EndToEndB2CAdminTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/EndToEndB2CGuestUserTest.xml (99%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/EndToEndB2CLoggedInUserTest.xml (99%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/StorefrontConfigurableProductDetailsTest.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct => app/code/Magento/ConfigurableProduct/Test/Mftf}/Test/StorefrontConfigurableProductViewTest.xml (97%)
 create mode 100644 app/code/Magento/ConfigurableProduct/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/ConfigurableProductGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/ConfigurableProductGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales => app/code/Magento/ConfigurableProductSales/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales => app/code/Magento/ConfigurableProductSales/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/ConfigurableProductSales/Test/Mftf/README.md
 create mode 100644 app/code/Magento/ConfigurableProductSales/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact => app/code/Magento/Contact/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact => app/code/Magento/Contact/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Contact/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Contact/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie => app/code/Magento/Cookie/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie => app/code/Magento/Cookie/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Cookie/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Cookie/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron => app/code/Magento/Cron/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron => app/code/Magento/Cron/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Cron/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Cron/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol => app/code/Magento/CurrencySymbol/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol => app/code/Magento/CurrencySymbol/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/ActionGroup/LoginToStorefrontActionGroup.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Data/AddressData.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Data/CustomerData.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Data/CustomerGroupData.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Data/ExtensionAttributeSimple.xml (62%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Data/RegionData.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Metadata/address-meta.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Metadata/customer-meta.xml (90%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Metadata/customer_extension_attribute-meta.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Metadata/customer_nested_extension_attribute-meta.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Metadata/region-meta.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Page/AdminCustomerPage.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Page/AdminEditCustomerPage.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Page/AdminNewCustomerPage.xml (69%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Page/StorefrontCustomerCreatePage.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Page/StorefrontCustomerDashboardPage.xml (68%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Page/StorefrontCustomerOrderPage.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Page/StorefrontCustomerOrderViewPage.xml (69%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Page/StorefrontCustomerSignInPage.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Page/StorefrontHomePage.xml (65%)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/AdminCustomerAccountInformationSection.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/AdminCustomerFiltersSection.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/AdminCustomerGridMainActionsSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/AdminCustomerGridSection.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/AdminCustomerMainActionsSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/AdminCustomerMessagesSection.xml (64%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/AdminEditCustomerInformationSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/AdminEditCustomerOrdersSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/StorefrontCustomerCreateFormSection.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/StorefrontCustomerDashboardAccountInformationSection.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/StorefrontCustomerOrderSection.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/StorefrontCustomerOrderViewSection.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/StorefrontCustomerSignInFormSection.xml (72%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Section/StorefrontPanelHeaderSection.xml (70%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Test/AdminCreateCustomerTest.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Test/EndToEndB2CLoggedInUserTest.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Test/StorefrontCreateCustomerTest.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer => app/code/Magento/Customer/Test/Mftf}/Test/StorefrontPersistedCustomerLoginTest.xml (90%)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics => app/code/Magento/CustomerAnalytics/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics => app/code/Magento/CustomerAnalytics/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/CustomerAnalytics/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CustomerAnalytics/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CustomerGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport => app/code/Magento/CustomerImportExport/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport => app/code/Magento/CustomerImportExport/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/CustomerImportExport/Test/Mftf/README.md
 create mode 100644 app/code/Magento/CustomerImportExport/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy => app/code/Magento/Deploy/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy => app/code/Magento/Deploy/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Deploy/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Deploy/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer => app/code/Magento/Developer/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer => app/code/Magento/Developer/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Developer/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Developer/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl => app/code/Magento/Dhl/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl => app/code/Magento/Dhl/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Dhl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Dhl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory => app/code/Magento/Directory/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory => app/code/Magento/Directory/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Directory/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Directory/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/ActionGroup/AdminDownloadableProductActionGroup.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/Data/LinkData.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/Data/ProductData.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/Metadata/downloadable_link-meta.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/Metadata/link_file_content-meta.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/Metadata/sample_file_content-meta.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/Page/AdminProductCreatePage.xml (69%)
 create mode 100644 app/code/Magento/Downloadable/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/Section/AdminProductDownloadableSection.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/Test/AdminAddDefaultImageDownloadableProductTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/Test/AdminRemoveDefaultImageDownloadableProductTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable => app/code/Magento/Downloadable/Test/Mftf}/Test/EndToEndB2CAdminTest.xml (94%)
 create mode 100644 app/code/Magento/Downloadable/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/DownloadableGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/DownloadableGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport => app/code/Magento/DownloadableImportExport/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport => app/code/Magento/DownloadableImportExport/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/DownloadableImportExport/Test/Mftf/README.md
 create mode 100644 app/code/Magento/DownloadableImportExport/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav => app/code/Magento/Eav/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav => app/code/Magento/Eav/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Eav/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Eav/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/EavGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/EavGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch => app/code/Magento/Elasticsearch/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch => app/code/Magento/Elasticsearch/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Elasticsearch/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Elasticsearch/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email => app/code/Magento/Email/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email => app/code/Magento/Email/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Email/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Email/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey => app/code/Magento/EncryptionKey/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey => app/code/Magento/EncryptionKey/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/EncryptionKey/Test/Mftf/README.md
 create mode 100644 app/code/Magento/EncryptionKey/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex => app/code/Magento/Fedex/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex => app/code/Magento/Fedex/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Fedex/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Fedex/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage => app/code/Magento/GiftMessage/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage => app/code/Magento/GiftMessage/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/GiftMessage/Test/Mftf/README.md
 create mode 100644 app/code/Magento/GiftMessage/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords => app/code/Magento/GoogleAdwords/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords => app/code/Magento/GoogleAdwords/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/GoogleAdwords/Test/Mftf/README.md
 create mode 100644 app/code/Magento/GoogleAdwords/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics => app/code/Magento/GoogleAnalytics/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics => app/code/Magento/GoogleAnalytics/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/GoogleAnalytics/Test/Mftf/README.md
 create mode 100644 app/code/Magento/GoogleAnalytics/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer => app/code/Magento/GoogleOptimizer/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer => app/code/Magento/GoogleOptimizer/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/GoogleOptimizer/Test/Mftf/README.md
 create mode 100644 app/code/Magento/GoogleOptimizer/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/GraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/GraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl => app/code/Magento/GroupedImportExport/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl => app/code/Magento/GroupedImportExport/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/GroupedImportExport/Test/Mftf/README.md
 create mode 100644 app/code/Magento/GroupedImportExport/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/GroupedProduct/Test/Mftf}/ActionGroup/AdminGroupedProductActionGroup.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/GroupedProduct/Test/Mftf}/Data/GroupedProductData.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/GroupedProduct/Test/Mftf}/Data/ProductLinkData.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/GroupedProduct/Test/Mftf}/Data/ProductLinkExtensionAttributeData.xml (61%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/GroupedProduct/Test/Mftf}/Data/ProductLinksData.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport => app/code/Magento/GroupedProduct/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport => app/code/Magento/GroupedProduct/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/GroupedProduct/Test/Mftf}/Page/AdminProductCreatePage.xml (71%)
 create mode 100644 app/code/Magento/GroupedProduct/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/GroupedProduct/Test/Mftf}/Section/AdminAddProductsToGroupPanelSection.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/GroupedProduct/Test/Mftf}/Section/AdminProductFormGroupedProductsSection.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/GroupedProduct/Test/Mftf}/Test/AdminAddDefaultImageGroupedProductTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/GroupedProduct/Test/Mftf}/Test/AdminRemoveDefaultImageGroupedProductTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/GroupedProduct/Test/Mftf}/Test/EndToEndB2CAdminTest.xml (94%)
 create mode 100644 app/code/Magento/GroupedProduct/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/GroupedProductGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/GroupedProductGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/ImportExport/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct => app/code/Magento/ImportExport/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/README.md
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport => app/code/Magento/Indexer/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport => app/code/Magento/Indexer/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Indexer/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Indexer/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/InstantPurchase/Test/Mftf/README.md
 create mode 100644 app/code/Magento/InstantPurchase/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer => app/code/Magento/Integration/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer => app/code/Magento/Integration/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Integration/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Integration/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase => app/code/Magento/LayeredNavigation/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase => app/code/Magento/LayeredNavigation/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/LayeredNavigation/Test/Mftf/README.md
 create mode 100644 app/code/Magento/LayeredNavigation/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration => app/code/Magento/Marketplace/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration => app/code/Magento/Marketplace/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Marketplace/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Marketplace/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation => app/code/Magento/MediaStorage/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation => app/code/Magento/MediaStorage/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/MediaStorage/Test/Mftf/README.md
 create mode 100644 app/code/Magento/MediaStorage/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace => app/code/Magento/MessageQueue/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace => app/code/Magento/MessageQueue/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/MessageQueue/Test/Mftf/README.md
 create mode 100644 app/code/Magento/MessageQueue/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage => app/code/Magento/Msrp/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage => app/code/Magento/Msrp/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Msrp/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Msrp/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue => app/code/Magento/Multishipping/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue => app/code/Magento/Multishipping/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Multishipping/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Multishipping/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp => app/code/Magento/MysqlMq/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp => app/code/Magento/MysqlMq/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/MysqlMq/Test/Mftf/README.md
 create mode 100644 app/code/Magento/MysqlMq/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping => app/code/Magento/NewRelicReporting/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping => app/code/Magento/NewRelicReporting/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/NewRelicReporting/Test/Mftf/README.md
 create mode 100644 app/code/Magento/NewRelicReporting/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter => app/code/Magento/Newsletter/Test/Mftf}/Data/NewsletterTemplateData.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq => app/code/Magento/Newsletter/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq => app/code/Magento/Newsletter/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter => app/code/Magento/Newsletter/Test/Mftf}/Page/NewsletterTemplatePage.xml (77%)
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter => app/code/Magento/Newsletter/Test/Mftf}/Section/NewsletterTemplateSection.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter => app/code/Magento/Newsletter/Test/Mftf}/Section/StorefrontNewsletterSection.xml (70%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter => app/code/Magento/Newsletter/Test/Mftf}/Test/AdminAddImageToWYSIWYGNewsletterTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter => app/code/Magento/Newsletter/Test/Mftf}/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter => app/code/Magento/Newsletter/Test/Mftf}/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter => app/code/Magento/Newsletter/Test/Mftf}/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml (94%)
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting => app/code/Magento/OfflinePayments/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting => app/code/Magento/OfflinePayments/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/OfflinePayments/Test/Mftf/README.md
 create mode 100644 app/code/Magento/OfflinePayments/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter => app/code/Magento/OfflineShipping/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter => app/code/Magento/OfflineShipping/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/OfflineShipping/Test/Mftf/README.md
 create mode 100644 app/code/Magento/OfflineShipping/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache => app/code/Magento/PageCache/Test/Mftf}/ActionGroup/ClearCacheActionGroup.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache => app/code/Magento/PageCache/Test/Mftf}/ActionGroup/ClearPageCacheActionGroup.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments => app/code/Magento/PageCache/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments => app/code/Magento/PageCache/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/PageCache/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache => app/code/Magento/PageCache/Test/Mftf}/Section/AdminCacheManagementSection.xml (81%)
 create mode 100644 app/code/Magento/PageCache/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment => app/code/Magento/Payment/Test/Mftf}/Data/PaymentMethodData.xml (62%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping => app/code/Magento/Payment/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping => app/code/Magento/Payment/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment => app/code/Magento/Payment/Test/Mftf}/Metadata/payment_method-meta.xml (63%)
 create mode 100644 app/code/Magento/Payment/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Payment/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal => app/code/Magento/Paypal/Test/Mftf}/Data/PaypalData.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache => app/code/Magento/Paypal/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache => app/code/Magento/Paypal/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal => app/code/Magento/Paypal/Test/Mftf}/Metadata/paypal_config-meta.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal => app/code/Magento/Paypal/Test/Mftf}/Page/AdminConfigPaymentMethodsPage.xml (69%)
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal => app/code/Magento/Paypal/Test/Mftf}/Section/OtherPaymentsConfigSection.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal => app/code/Magento/Paypal/Test/Mftf}/Test/AdminConfigPaymentsSectionState.xml (82%)
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent => app/code/Magento/Persistent/Test/Mftf}/Data/PersistentData.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment => app/code/Magento/Persistent/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment => app/code/Magento/Persistent/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent => app/code/Magento/Persistent/Test/Mftf}/Metadata/persistent_config-meta.xml (81%)
 create mode 100644 app/code/Magento/Persistent/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent => app/code/Magento/Persistent/Test/Mftf}/Test/GuestCheckoutWithEnabledPersistentTest.xml (97%)
 create mode 100644 app/code/Magento/Persistent/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal => app/code/Magento/ProductAlert/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal => app/code/Magento/ProductAlert/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/ProductAlert/Test/Mftf/README.md
 create mode 100644 app/code/Magento/ProductAlert/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo => app/code/Magento/ProductVideo/Test/Mftf}/ActionGroup/AdminProductVideoActionGroup.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo => app/code/Magento/ProductVideo/Test/Mftf}/ActionGroup/StorefrontProductVideoActionGroup.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo => app/code/Magento/ProductVideo/Test/Mftf}/Data/ProductVideoConfigData.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo => app/code/Magento/ProductVideo/Test/Mftf}/Data/ProductVideoData.xml (70%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo => app/code/Magento/ProductVideo/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo => app/code/Magento/ProductVideo/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo => app/code/Magento/ProductVideo/Test/Mftf}/Metadata/product_video_config-meta.xml (80%)
 create mode 100644 app/code/Magento/ProductVideo/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo => app/code/Magento/ProductVideo/Test/Mftf}/Section/AdminProductImagesSection.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo => app/code/Magento/ProductVideo/Test/Mftf}/Section/AdminProductNewVideoSection.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo => app/code/Magento/ProductVideo/Test/Mftf}/Section/StorefrontProductInfoMainSection.xml (68%)
 create mode 100644 app/code/Magento/ProductVideo/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote => app/code/Magento/Quote/Test/Mftf}/Data/CartItemData.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote => app/code/Magento/Quote/Test/Mftf}/Data/GuestCartData.xml (82%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent => app/code/Magento/Quote/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent => app/code/Magento/Quote/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote => app/code/Magento/Quote/Test/Mftf}/Metadata/billing_address-meta.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote => app/code/Magento/Quote/Test/Mftf}/Metadata/guest_cart-meta.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote => app/code/Magento/Quote/Test/Mftf}/Metadata/shipping_address-meta.xml (80%)
 create mode 100644 app/code/Magento/Quote/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Quote/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert => app/code/Magento/QuoteAnalytics/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert => app/code/Magento/QuoteAnalytics/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/QuoteAnalytics/Test/Mftf/README.md
 create mode 100644 app/code/Magento/QuoteAnalytics/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote => app/code/Magento/ReleaseNotification/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote => app/code/Magento/ReleaseNotification/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/ReleaseNotification/Test/Mftf/README.md
 create mode 100644 app/code/Magento/ReleaseNotification/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics => app/code/Magento/Reports/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics => app/code/Magento/Reports/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Reports/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Reports/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports => app/code/Magento/RequireJs/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports => app/code/Magento/RequireJs/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/RequireJs/Test/Mftf/README.md
 create mode 100644 app/code/Magento/RequireJs/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs => app/code/Magento/Review/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs => app/code/Magento/Review/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Review/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Review/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review => app/code/Magento/ReviewAnalytics/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review => app/code/Magento/ReviewAnalytics/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/ReviewAnalytics/Test/Mftf/README.md
 create mode 100644 app/code/Magento/ReviewAnalytics/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics => app/code/Magento/Robots/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics => app/code/Magento/Robots/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Robots/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Robots/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots => app/code/Magento/Rss/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots => app/code/Magento/Rss/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Rss/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Rss/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss => app/code/Magento/Rule/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss => app/code/Magento/Rule/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Rule/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Rule/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/ActionGroup/AdminCreditMemoActionGroup.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/ActionGroup/AdminInvoiceActionGroup.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/ActionGroup/AdminOrderActionGroup.xml (98%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/ActionGroup/AdminOrderGridActionGroup.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Data/AddressData.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Data/ConstData.xml (64%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Data/OrderData.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule => app/code/Magento/Sales/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule => app/code/Magento/Sales/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Page/AdminCreditMemoNewPage.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Page/AdminInvoiceDetailsPage.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Page/AdminInvoiceNewPage.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Page/AdminInvoicesPage.xml (68%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Page/AdminOrderCreatePage.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Page/AdminOrderDetailsPage.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Page/AdminOrdersPage.xml (65%)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminCreditMemoAddressInformationSection.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminCreditMemoItemsSection.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminCreditMemoOrderInformationSection.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminCreditMemoPaymentShippingSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminCreditMemoTotalSection.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminInvoiceAddressInformationSection.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminInvoiceDetailsInformationSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminInvoiceItemsSection.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminInvoiceMainActionsSection.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminInvoiceOrderInformationSection.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminInvoicePaymentShippingSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminInvoiceTotalSection.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminInvoicesFiltersSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminInvoicesGridSection.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderAddressInformationSection.xml (70%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderCommentsTabSection.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderCreditMemosTabSection.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderDetailsInformationSection.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderDetailsInvoicesSection.xml (69%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderDetailsMainActionsSection.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderDetailsMessagesSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderDetailsOrderViewSection.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderFormAccountSection.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderFormActionSection.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderFormBillingAddressSection.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderFormConfigureProductSection.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderFormItemsSection.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderFormPaymentSection.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderFormShippingAddressSection.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderFormTotalSection.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderInvoicesTabSection.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderItemsOrderedSection.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderPaymentInformationSection.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderShipmentsTabSection.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderShippingInformationSection.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderStoreScopeTreeSection.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrderTotalSection.xml (82%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/AdminOrdersGridSection.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Section/OrdersGridSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Test/AdminCreateInvoiceTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/Sales/Test/Mftf}/Test/EndToEndB2CAdminTest.xml (99%)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/SalesAnalytics/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales => app/code/Magento/SalesAnalytics/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/SalesAnalytics/Test/Mftf/README.md
 create mode 100644 app/code/Magento/SalesAnalytics/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics => app/code/Magento/SalesInventory/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics => app/code/Magento/SalesInventory/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/SalesInventory/Test/Mftf/README.md
 create mode 100644 app/code/Magento/SalesInventory/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/ActionGroup/AdminCartPriceRuleActionGroup.xml (72%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/ActionGroup/AdminSalesRuleActionGroup.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/ActionGroup/StorefrontSalesRuleActionGroup.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Data/QuoteData.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Data/SalesCouponData.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Data/SalesRuleCouponData.xml (68%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Data/SalesRuleData.xml (90%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Data/SalesRuleLabelData.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory => app/code/Magento/SalesRule/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory => app/code/Magento/SalesRule/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Metadata/sales_rule-condition-meta.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Metadata/sales_rule-coupon-meta.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Metadata/sales_rule-label-meta.xml (78%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Metadata/sales_rule-meta.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Page/AdminCartPriceRulesPage.xml (69%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Page/PriceRuleNewPage.xml (53%)
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Section/AdminCartPriceRulesFormSection.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Section/AdminCartPriceRulesSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Section/CheckoutCartSummarySection.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Section/DiscountSection.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Section/PriceRuleConditionsSection.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Section/StorefrontSalesRuleCartCouponSection.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/AdminCreateBuyXGetYFreeTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/AdminCreateFixedAmountDiscountTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/AdminCreatePercentOfProductPriceTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/EndToEndB2CGuestUserTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/EndToEndB2CLoggedInUserTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/PriceRuleCategoryNestingTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/StorefrontCartPriceRuleCountry.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/StorefrontCartPriceRulePostcode.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/StorefrontCartPriceRuleQuantity.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/StorefrontCartPriceRuleState.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesRule/Test/Mftf}/Test/StorefrontCartPriceRuleSubtotal.xml (96%)
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesSequence/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule => app/code/Magento/SalesSequence/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/SalesSequence/Test/Mftf/README.md
 create mode 100644 app/code/Magento/SalesSequence/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/SampleData/Test/Mftf/README.md
 create mode 100644 app/code/Magento/SampleData/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence => app/code/Magento/Search/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence => app/code/Magento/Search/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Search/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search => app/code/Magento/Search/Test/Mftf}/Section/StorefrontQuickSearchSection.xml (68%)
 create mode 100644 app/code/Magento/Search/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData => app/code/Magento/Security/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData => app/code/Magento/Security/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Security/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Security/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search => app/code/Magento/SendFriend/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search => app/code/Magento/SendFriend/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/SendFriend/Test/Mftf/README.md
 create mode 100644 app/code/Magento/SendFriend/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/ActionGroup/AdminShipmentActionGroup.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Data/FlatRateShippingMethodData.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Data/FreeShippingMethodData.xml (92%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Data/ShippingMethodData.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security => app/code/Magento/Shipping/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security => app/code/Magento/Shipping/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Metadata/shipping_methods-meta.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Page/AdminShipmentNewPage.xml (77%)
 create mode 100644 app/code/Magento/Shipping/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Section/AdminShipmentAddressInformationSection.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Section/AdminShipmentItemsSection.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Section/AdminShipmentMainActionsSection.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Section/AdminShipmentOrderInformationSection.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Section/AdminShipmentPaymentShippingSection.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Section/AdminShipmentTotalSection.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Shipping/Test/Mftf}/Test/EndToEndB2CAdminTest.xml (95%)
 create mode 100644 app/code/Magento/Shipping/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend => app/code/Magento/Signifyd/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend => app/code/Magento/Signifyd/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Signifyd/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Signifyd/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Sitemap/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping => app/code/Magento/Sitemap/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Sitemap/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Sitemap/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/ActionGroup/AdminCreateStoreViewActionGroup.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/ActionGroup/AdminCreateWebsiteActionGroup.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/ActionGroup/AdminDeleteStoreViewActionGroup.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/ActionGroup/AdminDeleteWebsiteActionGroup.xml (89%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/ActionGroup/AdminSwitchStoreViewActionGroup.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/ActionGroup/CreateCustomStoreViewActionGroup.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/ActionGroup/DeleteCustomStoreActionGroup.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Data/StoreData.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Data/StoreGroupData.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap => app/code/Magento/Store/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap => app/code/Magento/Store/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Metadata/store-meta.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Metadata/store_group-meta.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Page/AdminSystemStoreDeletePage.xml (68%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Page/AdminSystemStoreEditPage.xml (70%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Page/AdminSystemStoreGroupEditPage.xml (68%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Page/AdminSystemStoreGroupPage.xml (68%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Page/AdminSystemStorePage.xml (70%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Page/AdminSystemStoreViewPage.xml (70%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Page/AdminSystemStoreWebsitePage.xml (68%)
 create mode 100644 app/code/Magento/Store/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/AdminMainActionsSection.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/AdminNewStoreGroupSection.xml (77%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/AdminNewStoreSection.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/AdminNewStoreViewActionsSection.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/AdminNewWebsiteActionsSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/AdminNewWebsiteSection.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/AdminStoreBackupOptionsSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/AdminStoreGroupActionsSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/AdminStoresDeleteStoreGroupSection.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/AdminStoresGridSection.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/AdminStoresMainActionsSection.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Section/StorefrontHeaderSection.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Test/AdminCreateStoreGroupTest.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Store/Test/Mftf}/Test/AdminCreateStoreViewTest.xml (87%)
 create mode 100644 app/code/Magento/Store/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/StoreGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/StoreGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Swagger/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store => app/code/Magento/Swagger/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Swagger/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Swagger/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger => app/code/Magento/SwaggerWebapi/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger => app/code/Magento/SwaggerWebapi/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/SwaggerWebapi/Test/Mftf/README.md
 create mode 100644 app/code/Magento/SwaggerWebapi/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches => app/code/Magento/SwaggerWebapiAsync/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches => app/code/Magento/SwaggerWebapiAsync/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/SwaggerWebapiAsync/Test/Mftf/README.md
 create mode 100644 app/code/Magento/SwaggerWebapiAsync/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation => app/code/Magento/Swatches/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation => app/code/Magento/Swatches/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Swatches/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Swatches/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/SwatchesGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/SwatchesGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/SwatchesLayeredNavigation/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/SwatchesLayeredNavigation/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/README.md
 create mode 100644 app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/Tax/Test/Mftf}/ActionGroup/AdminTaxActionGroup.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/Tax/Test/Mftf}/Data/TaxCodeData.xml (80%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport => app/code/Magento/Tax/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport => app/code/Magento/Tax/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/Tax/Test/Mftf}/Page/AdminNewTaxRulePage.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/Tax/Test/Mftf}/Page/AdminTaxConfigurationPage.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/Tax/Test/Mftf}/Page/AdminTaxRateGridPage.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/Tax/Test/Mftf}/Page/AdminTaxRuleGridPage.xml (68%)
 create mode 100644 app/code/Magento/Tax/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/Tax/Test/Mftf}/Section/AdminConfigureTaxSection.xml (93%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/Tax/Test/Mftf}/Section/AdminTaxRulesSection.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/Tax/Test/Mftf}/Test/StorefrontTaxQuoteCartTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax => app/code/Magento/Tax/Test/Mftf}/Test/StorefrontTaxQuoteCheckoutTest.xml (97%)
 create mode 100644 app/code/Magento/Tax/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/TaxGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/TaxGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme => app/code/Magento/TaxImportExport/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme => app/code/Magento/TaxImportExport/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/TaxImportExport/Test/Mftf/README.md
 create mode 100644 app/code/Magento/TaxImportExport/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3 => app/code/Magento/Theme/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3 => app/code/Magento/Theme/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme => app/code/Magento/Theme/Test/Mftf}/Page/ThemesPage.xml (65%)
 create mode 100644 app/code/Magento/Theme/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme => app/code/Magento/Theme/Test/Mftf}/Section/AdminThemeSection.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme => app/code/Magento/Theme/Test/Mftf}/Section/StorefrontFooterSection.xml (58%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme => app/code/Magento/Theme/Test/Mftf}/Section/StorefrontMessagesSection.xml (71%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme => app/code/Magento/Theme/Test/Mftf}/Test/ThemeTest.xml (87%)
 create mode 100644 app/code/Magento/Theme/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation => app/code/Magento/Tinymce3/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation => app/code/Magento/Tinymce3/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Tinymce3/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3 => app/code/Magento/Tinymce3/Test/Mftf}/Section/AdminTinymce3FileldsSection.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3 => app/code/Magento/Tinymce3/Test/Mftf}/Test/AdminSwitchWYSIWYGOptionsTest.xml (97%)
 create mode 100644 app/code/Magento/Tinymce3/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui => app/code/Magento/Translation/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui => app/code/Magento/Translation/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Translation/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Translation/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui => app/code/Magento/Ui/Test/Mftf}/ActionGroup/AdminDataGridFilterActionGroup.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui => app/code/Magento/Ui/Test/Mftf}/ActionGroup/AdminDataGridPaginationActionGroup.xml (86%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui => app/code/Magento/Ui/Test/Mftf}/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml (83%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui => app/code/Magento/Ui/Test/Mftf}/ActionGroup/AdminSaveAndCloseActionGroup.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups => app/code/Magento/Ui/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups => app/code/Magento/Ui/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Ui/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui => app/code/Magento/Ui/Test/Mftf}/Section/AdminDataGridHeaderSection.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui => app/code/Magento/Ui/Test/Mftf}/Section/AdminDataGridPaginationSection.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui => app/code/Magento/Ui/Test/Mftf}/Section/AdminDataGridTableSection.xml (87%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui => app/code/Magento/Ui/Test/Mftf}/Section/AdminGridControlsSection.xml (96%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui => app/code/Magento/Ui/Test/Mftf}/Section/ModalConfirmationSection.xml (73%)
 create mode 100644 app/code/Magento/Ui/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite => app/code/Magento/Ups/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite => app/code/Magento/Ups/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Ups/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Ups/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/UrlRewrite/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/UrlRewrite/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/UrlRewrite/Test/Mftf/README.md
 create mode 100644 app/code/Magento/UrlRewrite/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/UrlRewriteGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/UrlRewriteGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/ActionGroup/AdminCreateUserActionGroup.xml (91%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/Data/UserData.xml (74%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/Data/UserRoleData.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps => app/code/Magento/User/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps => app/code/Magento/User/Test/Mftf}/LICENSE_AFL.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/Page/AdminEditRolePage.xml (67%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/Page/AdminEditUserPage.xml (69%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/Page/AdminRolesPage.xml (66%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/Page/AdminUsersPage.xml (66%)
 create mode 100644 app/code/Magento/User/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/Section/AdminEditRoleInfoSection.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/Section/AdminEditUserRoleSection.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/Section/AdminEditUserSection.xml (88%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/Section/AdminRoleGridSection.xml (81%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User => app/code/Magento/User/Test/Mftf}/Section/AdminUserGridSection.xml (81%)
 create mode 100644 app/code/Magento/User/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable => app/code/Magento/Usps/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable => app/code/Magento/Usps/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Usps/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Usps/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable => app/code/Magento/Variable/Test/Mftf}/ActionGroup/CreateCustomVariableActionGroup.xml (90%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable => app/code/Magento/Variable/Test/Mftf}/Data/VariableData.xml (73%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault => app/code/Magento/Variable/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault => app/code/Magento/Variable/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Variable/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Variable/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version => app/code/Magento/Vault/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version => app/code/Magento/Vault/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Vault/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Vault/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi => app/code/Magento/Version/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi => app/code/Magento/Version/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Version/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Version/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity => app/code/Magento/Webapi/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity => app/code/Magento/Webapi/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Webapi/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Webapi/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee => app/code/Magento/WebapiAsync/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee => app/code/Magento/WebapiAsync/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/WebapiAsync/Test/Mftf/README.md
 create mode 100644 app/code/Magento/WebapiAsync/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget => app/code/Magento/WebapiSecurity/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget => app/code/Magento/WebapiSecurity/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/WebapiSecurity/Test/Mftf/README.md
 create mode 100644 app/code/Magento/WebapiSecurity/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Weee/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Weee/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Weee/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Weee/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/WeeeGraphQl/Test/Mftf/README.md
 create mode 100644 app/code/Magento/WeeeGraphQl/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics => app/code/Magento/Widget/Test/Mftf}/LICENSE.txt (100%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics => app/code/Magento/Widget/Test/Mftf}/LICENSE_AFL.txt (100%)
 create mode 100644 app/code/Magento/Widget/Test/Mftf/README.md
 create mode 100644 app/code/Magento/Widget/Test/Mftf/composer.json
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/ActionGroup/StorefrontCustomerWishlistActionGroup.xml (95%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/Data/WishlistData.xml (72%)
 create mode 100644 app/code/Magento/Wishlist/Test/Mftf/LICENSE.txt
 create mode 100644 app/code/Magento/Wishlist/Test/Mftf/LICENSE_AFL.txt
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/Metadata/wishlist-meta.xml (76%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/Page/StorefrontCustomerWishlistPage.xml (67%)
 create mode 100644 app/code/Magento/Wishlist/Test/Mftf/README.md
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/Section/StorefrontCategoryProductSection.xml (75%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/Section/StorefrontCustomerWishlistProductSection.xml (84%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/Section/StorefrontCustomerWishlistSection.xml (79%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/Section/StorefrontCustomerWishlistSidebarSection.xml (85%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/Section/StorefrontProductInfoMainSection.xml (65%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/Test/EndToEndB2CLoggedInUserTest.xml (94%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml (97%)
 rename {dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist => app/code/Magento/Wishlist/Test/Mftf}/Test/StorefrontDeletePersistedWishlistTest.xml (94%)
 create mode 100644 app/code/Magento/Wishlist/Test/Mftf/composer.json
 create mode 100644 app/code/Magento/WishlistAnalytics/Test/Mftf/LICENSE.txt
 create mode 100644 app/code/Magento/WishlistAnalytics/Test/Mftf/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/WishlistAnalytics/Test/Mftf/README.md
 create mode 100644 app/code/Magento/WishlistAnalytics/Test/Mftf/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/README.md
 delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE.txt b/app/code/Magento/AdminNotification/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE.txt
rename to app/code/Magento/AdminNotification/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE_AFL.txt b/app/code/Magento/AdminNotification/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE_AFL.txt
rename to app/code/Magento/AdminNotification/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/AdminNotification/Test/Mftf/README.md b/app/code/Magento/AdminNotification/Test/Mftf/README.md
new file mode 100644
index 0000000000000..33f88ba74200a
--- /dev/null
+++ b/app/code/Magento/AdminNotification/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Admin Notification Functional Tests
+
+The Functional Test Module for **Magento Admin Notification** module.
diff --git a/app/code/Magento/AdminNotification/Test/Mftf/composer.json b/app/code/Magento/AdminNotification/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..6dcd053378c1b
--- /dev/null
+++ b/app/code/Magento/AdminNotification/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-admin-notification",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE.txt b/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE.txt
rename to app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE_AFL.txt b/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE_AFL.txt
rename to app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/README.md b/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..7b4d0f3f0b12b
--- /dev/null
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Advanced Pricing Import Export Functional Tests
+
+The Functional Test Module for **Magento Advanced Pricing Import Export** module.
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/composer.json b/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..df2817ad6a52f
--- /dev/null
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Mftf/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "magento/functional-test-module-advanced-pricing-import-export",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-import-export": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-import-export": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE.txt b/app/code/Magento/AdvancedSearch/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE.txt
rename to app/code/Magento/AdvancedSearch/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_AFL.txt b/app/code/Magento/AdvancedSearch/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_AFL.txt
rename to app/code/Magento/AdvancedSearch/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/AdvancedSearch/Test/Mftf/README.md b/app/code/Magento/AdvancedSearch/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8b4af0e626eb0
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Advanced Search Functional Tests
+
+The Functional Test Module for **Magento Advanced Search** module.
diff --git a/app/code/Magento/AdvancedSearch/Test/Mftf/composer.json b/app/code/Magento/AdvancedSearch/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..b5582c72a039a
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-advanced-search",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-search": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-search": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE.txt b/app/code/Magento/Amqp/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE.txt
rename to app/code/Magento/Amqp/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE_AFL.txt b/app/code/Magento/Amqp/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE_AFL.txt
rename to app/code/Magento/Amqp/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Amqp/Test/Mftf/README.md b/app/code/Magento/Amqp/Test/Mftf/README.md
new file mode 100644
index 0000000000000..12d1bbc3a4890
--- /dev/null
+++ b/app/code/Magento/Amqp/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Amqp Functional Tests
+
+The Functional Test Module for **Magento Amqp** module.
diff --git a/app/code/Magento/Amqp/Test/Mftf/composer.json b/app/code/Magento/Amqp/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..348200c5d1cb4
--- /dev/null
+++ b/app/code/Magento/Amqp/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-amqp",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/framework-amqp": "100.0.0-dev",
+        "magento/framework-message-queue": "100.0.0-dev",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserData.xml b/app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserData.xml
rename to app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml
index c15e6004ed64a..8324ad5ba995a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserData.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="adminNoReport" type="user">
         <data key="username" unique="suffix">noreport</data>
         <data key="firstname">No</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserRoleData.xml b/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserRoleData.xml
rename to app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
index 162b477ff68fb..71d8bdcd5994b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserRoleData.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="adminNoReportRole" type="user_role">
         <data key="rolename" unique="suffix">noreport</data>
         <data key="current_password">123123q</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/LICENSE.txt b/app/code/Magento/Analytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/LICENSE.txt
rename to app/code/Magento/Analytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/LICENSE_AFL.txt b/app/code/Magento/Analytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/LICENSE_AFL.txt
rename to app/code/Magento/Analytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Metadata/user-meta.xml b/app/code/Magento/Analytics/Test/Mftf/Metadata/user-meta.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Metadata/user-meta.xml
rename to app/code/Magento/Analytics/Test/Mftf/Metadata/user-meta.xml
index 7d62c37d914e5..06186d2d10402 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Metadata/user-meta.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Metadata/user-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateUser" dataType="user" type="create"
                auth="adminFormKey" url="/admin/user/save/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
         <contentType>application/x-www-form-urlencoded</contentType>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Metadata/user_role-meta.xml b/app/code/Magento/Analytics/Test/Mftf/Metadata/user_role-meta.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Metadata/user_role-meta.xml
rename to app/code/Magento/Analytics/Test/Mftf/Metadata/user_role-meta.xml
index 66c4ebab1aeed..f52468807928e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Metadata/user_role-meta.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Metadata/user_role-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateUserRole" dataType="user_role" type="create"
                auth="adminFormKey" url="/admin/user_role/saverole/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
         <contentType>application/x-www-form-urlencoded</contentType>
diff --git a/app/code/Magento/Analytics/Test/Mftf/README.md b/app/code/Magento/Analytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..cdeb48941e6a4
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Analytics Functional Tests
+
+The Functional Test Module for **Magento Analytics** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationBlankIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationBlankIndustryTest.xml
rename to app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
index a266cdff269ab..8649eac484d94 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationBlankIndustryTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminConfigurationBlankIndustryTest">
         <annotations>
             <features value="Analytics"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationEnableDisableAnalyticsTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
rename to app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
index 8e371d24cbe4a..8b0714cd2ef65 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminConfigurationEnableDisableAnalyticsTest">
         <annotations>
             <features value="Analytics"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationIndustryTest.xml
rename to app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
index 7a5c67095a50c..6b38bccf33dd5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationIndustryTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminConfigurationIndustryTest">
         <annotations>
             <features value="Analytics"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationPermissionTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationPermissionTest.xml
rename to app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
index b28f269f9b9a6..501dba3dba23b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationPermissionTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminConfigurationPermissionTest">
         <annotations>
             <features value="Analytics"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationTimeToSendDataTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationTimeToSendDataTest.xml
rename to app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
index ad3593e1828eb..e4630c1d5b5a1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationTimeToSendDataTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminConfigurationTimeToSendDataTest">
         <annotations>
             <features value="Analytics"/>
diff --git a/app/code/Magento/Analytics/Test/Mftf/composer.json b/app/code/Magento/Analytics/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..cc288fbbb130d
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-analytics",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-integration": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Mftf/README.md b/app/code/Magento/AsynchronousOperations/Test/Mftf/README.md
new file mode 100644
index 0000000000000..2f73e44149f2c
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Asynchronous Operations Functional Tests
+
+The Functional Test Module for **Magento Asynchronous Operations** module.
diff --git a/app/code/Magento/AsynchronousOperations/Test/Mftf/composer.json b/app/code/Magento/AsynchronousOperations/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..baadc0d0d914a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Mftf/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/functional-test-module-asynchronous-operations",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/framework-bulk": "100.0.0-dev",
+        "magento/functional-test-module-authorization": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-user": "100.0.0-dev",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-admin-notification": "100.0.0-dev",
+        "magento/functional-test-module-logging": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/LICENSE.txt b/app/code/Magento/Authorization/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/LICENSE.txt
rename to app/code/Magento/Authorization/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/LICENSE_AFL.txt b/app/code/Magento/Authorization/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/LICENSE_AFL.txt
rename to app/code/Magento/Authorization/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Authorization/Test/Mftf/README.md b/app/code/Magento/Authorization/Test/Mftf/README.md
new file mode 100644
index 0000000000000..1d44ab2e73052
--- /dev/null
+++ b/app/code/Magento/Authorization/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Authorization Functional Tests
+
+The Functional Test Module for **Magento Authorization** module.
diff --git a/app/code/Magento/Authorization/Test/Mftf/composer.json b/app/code/Magento/Authorization/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..fddc5acb034ed
--- /dev/null
+++ b/app/code/Magento/Authorization/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-authorization",
+    "description": "Authorization module provides access to Magento ACL functionality.",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/LICENSE.txt b/app/code/Magento/Authorizenet/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/LICENSE.txt
rename to app/code/Magento/Authorizenet/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/LICENSE_AFL.txt b/app/code/Magento/Authorizenet/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/LICENSE_AFL.txt
rename to app/code/Magento/Authorizenet/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Authorizenet/Test/Mftf/README.md b/app/code/Magento/Authorizenet/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9391126a85c94
--- /dev/null
+++ b/app/code/Magento/Authorizenet/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Authorizenet Functional Tests
+
+The Functional Test Module for **Magento Authorizenet** module.
diff --git a/app/code/Magento/Authorizenet/Test/Mftf/composer.json b/app/code/Magento/Authorizenet/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..b02806a0ae3f3
--- /dev/null
+++ b/app/code/Magento/Authorizenet/Test/Mftf/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/functional-test-module-authorizenet",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LoginActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginActionGroup.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LoginActionGroup.xml
rename to app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginActionGroup.xml
index 4367214edbc1b..bcff329d79dad 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LoginActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="LoginActionGroup">
         <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/>
         <fillField userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" selector="{{AdminLoginFormSection.username}}" stepKey="fillUsername"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LoginAsAdminActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LoginAsAdminActionGroup.xml
rename to app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
index 2f7ce506acb1d..8a24ab2a2f185 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LoginAsAdminActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="LoginAsAdmin">
         <arguments>
             <argument name="adminUser" defaultValue="_ENV"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LogoutActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LogoutActionGroup.xml
similarity index 63%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LogoutActionGroup.xml
rename to app/code/Magento/Backend/Test/Mftf/ActionGroup/LogoutActionGroup.xml
index 4a5bed2ed0a68..cdaf231e9dda0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/LogoutActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/LogoutActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="logout">
         <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
     </actionGroup>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/SecondaryGridActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/SecondaryGridActionGroup.xml
rename to app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml
index 7c2c1c3c5702b..9fe5f54f1db3c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/SecondaryGridActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Action group to delete an item given that items name -->
     <!-- Must already be on the admin page containing the grid -->
     <actionGroup name="deleteEntitySecondaryGrid">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/SortByIdDescendingActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/SortByIdDescendingActionGroup.xml
rename to app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml
index 5c130df74b66c..b7b63c5d9a62e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/ActionGroup/SortByIdDescendingActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SortByIdDescendingActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SortByIdDescendingActionGroup">
         <conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending" visible="true"/>
         <waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Data/BackenedData.xml b/app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml
similarity index 61%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Data/BackenedData.xml
rename to app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml
index 79185b3a9db55..286685315a7bc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Data/BackenedData.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="backendDataOne" type="backend">
         <data key="backendConfigName">data</data>
     </entity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/LICENSE.txt b/app/code/Magento/Backend/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/LICENSE.txt
rename to app/code/Magento/Backend/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/LICENSE_AFL.txt b/app/code/Magento/Backend/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/LICENSE_AFL.txt
rename to app/code/Magento/Backend/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminConfigurationStoresPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminConfigurationStoresPage.xml
rename to app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
index 08448464b4c4a..a53938d534644 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminConfigurationStoresPage.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationStoresPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="ConfigurationStoresPage" url="admin/system_config/edit/section/cms/" area="admin" module="Catalog">
         <section name="WYSIWYGOptionsSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLoginPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml
similarity index 64%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLoginPage.xml
rename to app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml
index 8b4b7307e1f97..ca0797f7ded26 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLoginPage.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminLoginPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminLoginPage" url="admin" area="admin" module="Magento_Backend">
         <section name="AdminLoginFormSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLogoutPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml
similarity index 61%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLogoutPage.xml
rename to app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml
index 6eb02dfb3b7fb..75ef114ec64b6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Page/AdminLogoutPage.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminLogoutPage.xml
@@ -7,6 +7,6 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminLogoutPage" url="admin/auth/logout/" area="admin" module="Magento_Backend"/>
 </pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/README.md b/app/code/Magento/Backend/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ed8a3a3bc2c49
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Backend Functional Tests
+
+The Functional Test Module for **Magento Backend** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminConfirmationModalSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminConfirmationModalSection.xml
rename to app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
index f7b2f246b55be..dc512e66528ac 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminConfirmationModalSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminConfirmationModalSection">
         <element name="title" type="text" selector="aside.confirm .modal-title"/>
         <element name="message" type="text" selector="aside.confirm .modal-content"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminGridTableSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminGridTableSection.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminGridTableSection.xml
rename to app/code/Magento/Backend/Test/Mftf/Section/AdminGridTableSection.xml
index 3d96a48ac79b5..3e8f8a8f2e412 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminGridTableSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminGridTableSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminGridTableSection">
         <element name="row" type="text" selector="table.data-grid tbody tr[data-role=row]:nth-of-type({{row}})" parameterized="true"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminHeaderSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
similarity index 64%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminHeaderSection.xml
rename to app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
index 4f972d84ed236..92b06878ab87f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminHeaderSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminHeaderSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminHeaderSection">
         <element name="pageTitle" type="text" selector=".page-header h1.page-title"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminLoginFormSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminLoginFormSection.xml
rename to app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
index 3d43a267026c2..b65a969e334c4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminLoginFormSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminLoginFormSection">
         <element name="username" type="input" selector="#username"/>
         <element name="password" type="input" selector="#login"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMainActionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMainActionsSection.xml
rename to app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
index 26c37fee8c12a..f8d259cc8e490 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMainActionsSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminMainActionsSection">
         <element name="save" type="button" selector="#save"/>
         <element name="delete" type="button" selector="#delete"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
similarity index 64%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml
rename to app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
index d072f4aecb576..ac35f3f8f6b1f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminMessagesSection">
         <element name="success" type="text" selector="#messages div.message-success"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminSecondaryGridSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminSecondaryGridSection.xml
rename to app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml
index a3268630567ad..724bf472de0f5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminSecondaryGridSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminSecondaryGridSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminSecondaryGridSection">
         <element name="resetFilters" type="button" selector="[title='Reset Filter']"/>
         <element name="taxIdentifierSearch" type="input" selector=".col-code .admin__control-text"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Test/AdminLoginTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Test/AdminLoginTest.xml
rename to app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml
index 3d0f6d5dfcea9..99d0f6654738a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Test/AdminLoginTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminLoginTest">
         <annotations>
             <features value="Backend"/>
diff --git a/app/code/Magento/Backend/Test/Mftf/composer.json b/app/code/Magento/Backend/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..adc3900cfe054
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "magento/functional-test-module-backend",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backup": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-developer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-reports": "100.0.0-dev",
+        "magento/functional-test-module-require-js": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-security": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-translation": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-user": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-theme": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/LICENSE.txt b/app/code/Magento/Backup/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/LICENSE.txt
rename to app/code/Magento/Backup/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/LICENSE_AFL.txt b/app/code/Magento/Backup/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/LICENSE_AFL.txt
rename to app/code/Magento/Backup/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Backup/Test/Mftf/README.md b/app/code/Magento/Backup/Test/Mftf/README.md
new file mode 100644
index 0000000000000..6951acdf41400
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Backup Functional Tests
+
+The Functional Test Module for **Magento Backup** module.
diff --git a/app/code/Magento/Backup/Test/Mftf/composer.json b/app/code/Magento/Backup/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..d7a6c804ab5b3
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/functional-test-module-backup",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-cron": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Data/BraintreeData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Data/BraintreeData.xml
rename to app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
index d5904edd94e9a..6e669a1b8bf4b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Data/BraintreeData.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="SampleBraintreeConfig" type="braintree_config_state">
         <requiredEntity type="title">SampleTitle</requiredEntity>
         <requiredEntity type="payment_action">SamplePaymentAction</requiredEntity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/LICENSE.txt b/app/code/Magento/Braintree/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/LICENSE.txt
rename to app/code/Magento/Braintree/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/LICENSE_AFL.txt b/app/code/Magento/Braintree/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/LICENSE_AFL.txt
rename to app/code/Magento/Braintree/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Metadata/braintree_config-meta.xml b/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Metadata/braintree_config-meta.xml
rename to app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
index dc3e8e6c5dac1..e4d02a58b5bf4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/Metadata/braintree_config-meta.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Metadata/braintree_config-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateBraintreeConfigState" dataType="braintree_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
         <object key="groups" dataType="braintree_config_state">
             <object key="braintree_section" dataType="braintree_config_state">
diff --git a/app/code/Magento/Braintree/Test/Mftf/README.md b/app/code/Magento/Braintree/Test/Mftf/README.md
new file mode 100644
index 0000000000000..6ee177a9cdcd2
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Braintree Functional Tests
+
+The Functional Test Module for **Magento Braintree** module.
diff --git a/app/code/Magento/Braintree/Test/Mftf/composer.json b/app/code/Magento/Braintree/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..2f827424cb7f1
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "magento/functional-test-module-braintree",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/magento-composer-installer": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-instant-purchase": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev",
+        "magento/functional-test-module-paypal": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-vault": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-checkout-agreements": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/AdminBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/AdminBundleProductActionGroup.xml
rename to app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml
index 241bd19e1b607..a5e62fca9483c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/AdminBundleProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Fill main fields in create product form-->
     <actionGroup name="fillMainBundleProductForm">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/AdminClearFiltersActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/AdminClearFiltersActionGroup.xml
rename to app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml
index cac724588937a..f3e5eff3834e3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/AdminClearFiltersActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminClearFiltersActionGroup">
         <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
         <waitForPageLoad stepKey="WaitForPageToLoad"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/BundleProductFilterActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductFilterActionGroup.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/BundleProductFilterActionGroup.xml
rename to app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductFilterActionGroup.xml
index cb0e9558976f5..8ab7af1d0318e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/BundleProductFilterActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductFilterActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="BundleProductFilter">
         <!--Setting filter-->
         <!--Prereq: go to admin product catalog page-->
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/CreateBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/CreateBundleProductActionGroup.xml
rename to app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
index fa44b7df150e4..e104803fd405d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/CreateBundleProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CreateBasicBundleProduct">
         <!--Prereq: Go to bundle product creation page-->
         <!--Product name and SKU-->
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/EnableDisableProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/EnableDisableProductActionGroup.xml
rename to app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
index cdd13185cd0e3..2ae9748c773e8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/EnableDisableProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AncillaryPrepBundleProduct">
         <!--Prereq: go to bundle product creation page-->
         <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleLinkData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleLinkData.xml
rename to app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
index 65add76a12af3..1cc0ce147ae0e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleLinkData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ApiBundleLink" type="bundle_link">
         <var key="sku" entityKey="sku" entityType="product2"/>
         <var key="option_id" entityKey="option_id" entityType="bundle_options"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleOptionData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleOptionData.xml
rename to app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
index 02f70ec15cab8..80d9307255e59 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/BundleOptionData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleOptionData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="DropdownBundleOption" type="bundle_option">
         <data key="title" unique="suffix">bundle-option-dropdown</data>
         <data key="required">true</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/CustomAttributeData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/CustomAttributeData.xml
rename to app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
index c7f150e7ad6fb..65ac763460151 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/CustomAttributeData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
@@ -6,7 +6,7 @@
   */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="CustomAttributeDynamicPrice" type="custom_attribute">
         <data key="attribute_code">price_type</data>
         <data key="value">0</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml
rename to app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
index 3683721909ab2..41006ee9b4d09 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Data/ProductData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="BundleProduct" type="product">
         <data key="name" unique="suffix">BundleProduct</data>
         <data key="name" unique="suffix">BundleProduct</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/LICENSE.txt b/app/code/Magento/Bundle/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/LICENSE.txt
rename to app/code/Magento/Bundle/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/LICENSE_AFL.txt b/app/code/Magento/Bundle/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/LICENSE_AFL.txt
rename to app/code/Magento/Bundle/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_link-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_link-meta.xml
rename to app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
index be881a7e98d65..435cf59c6cbfd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_link-meta.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_link-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateBundleLink" dataType="bundle_link" type="create" auth="adminOauth" url="/V1/bundle-products/{sku}/links/{option_id}" method="POST">
         <contentType>application/json</contentType>
         <object dataType="bundle_link" key="linkedProduct">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_option-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_option-meta.xml
rename to app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml
index 991c01ec4c6f0..c912ea5eac41a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_option-meta.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_option-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateBundleOption" dataType="bundle_option" type="create" auth="adminOauth" url="/V1/bundle-products/options/add" method="POST">
         <contentType>application/json</contentType>
         <object dataType="bundle_option" key="option">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_options-meta.xml b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_options-meta.xml
rename to app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml
index a81d5dda6a40b..12cba3fc179fe 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Metadata/bundle_options-meta.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Metadata/bundle_options-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="GetAllBundleOptions" dataType="bundle_options" type="get" auth="adminOauth" url="/V1/bundle-products/{sku}/options/all" method="GET">
         <contentType>application/json</contentType>
     </operation>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Page/AdminCatalogProductPage.xml b/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Page/AdminCatalogProductPage.xml
rename to app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml
index f3e9366bb2bf6..cb97521499e23 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Page/AdminCatalogProductPage.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Page/AdminCatalogProductPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminCatalogProductPage" url="catalog/product/" area="admin" module="Magento_Bundle">
         <section name="AdminCatalogProductSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Page/AdminProductCreatePage.xml b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Page/AdminProductCreatePage.xml
rename to app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
index 5a17304ab28b8..f0048e2fc95d4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -7,7 +7,7 @@
  -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
         <section name="AdminProductFormBundleSection"/>
     </page>
diff --git a/app/code/Magento/Bundle/Test/Mftf/README.md b/app/code/Magento/Bundle/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8e8da0c15fa56
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Bundle Functional Tests
+
+The Functional Test Module for **Magento Bundle** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/AdminProductFormBundleSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/AdminProductFormBundleSection.xml
rename to app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
index 6bc65d2d18491..5f8cde2997c08 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/AdminProductFormBundleSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductFormBundleSection">
         <element name="bundleItemsToggle" type="button" selector="//span[text()='Bundle Items']"/>
         <element name="shipmentType" type="select" selector=".admin__control-select[name='product[shipment_type]']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/BundleStorefrontSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/BundleStorefrontSection.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/BundleStorefrontSection.xml
rename to app/code/Magento/Bundle/Test/Mftf/Section/BundleStorefrontSection.xml
index b7ca65b28c9bb..9f4e6e04ac351 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/BundleStorefrontSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/BundleStorefrontSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="BundleStorefrontSection">
         <!--TestingForLocationOfOptions-->
         <element name="bundleOptionSelector" type="button" selector="//*[@id='bundle-slide']/span"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/StorefrontBundledSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/StorefrontBundledSection.xml
rename to app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
index 2b9a1ca624f79..311201e624d4b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/StorefrontBundledSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontBundledSection">
         <element name="nthBundledOption" type="input" selector=".option:nth-of-type({{numOption}}) .choice:nth-of-type({{numOptionSelect}}) input" parameterized="true"/>
         <element name="addToCart" type="button" selector="#bundle-slide" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddBundleItemsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddBundleItemsTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
index c46f052db59ac..d94e196ea5ad1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddBundleItemsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddBundleItemsTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddDefaultImageBundleProductTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
index 6a145b98a1816..e1f90790b30a9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddDefaultImageBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultImageBundleProductTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAttributeSetSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAttributeSetSelectionTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
index abf8ed3a8bc87..795982eb4b939 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAttributeSetSelectionTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAttributeSetSelectionTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminDeleteABundleProduct.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminDeleteABundleProduct.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
index 5c2244e85a061..3f88a9f277105 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminDeleteABundleProduct.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminDeleteABundleProduct">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminFilterProductListByBundleProduct.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminFilterProductListByBundleProduct.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
index ad4e90a050a40..9faf9e69bc873 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminFilterProductListByBundleProduct.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminFilterProductListByBundleProduct">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminMassDeleteBundleProducts.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminMassDeleteBundleProducts.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
index ca692e5d9374d..708580b3c9940 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminMassDeleteBundleProducts.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminMassDeleteBundleProductsTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminProductBundleCreationTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminProductBundleCreationTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
index 2641919e204fa..5e7a098790724 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminProductBundleCreationTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminProductBundleCreationTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminRemoveDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminRemoveDefaultImageBundleProductTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
index 6c3be47a1cb7a..9ce345cde681c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminRemoveDefaultImageBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultImageBundleProductTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/BundleProductFixedPricingTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/BundleProductFixedPricingTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
index 0df2619ab6db2..a579460906d0e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/BundleProductFixedPricingTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="BundleProductFixedPricingTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EnableDisableBundleProductStatusTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EnableDisableBundleProductStatusTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
index 5588d30619c48..d967143258918 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EnableDisableBundleProductStatusTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EnableDisableBundleProductStatusTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EndToEndB2CAdminTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EndToEndB2CAdminTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index dc98f5f43d880..9402d1d48012f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
         <test name="EndToEndB2CAdminTest">
             <!--Create Bundle Product-->
             <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle" after="seeSimpleProductInGrid"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/MassEnableDisableBundleProductsTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
index 2754cbcccab7c..27d95cfb5cfa5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/MassEnableDisableBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="MassEnableDisableBundleProductsTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/NewBundleProductSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/NewBundleProductSelectionTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml
index cb19b9f996d56..8a0a1ceaf52c7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/NewBundleProductSelectionTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="NewBundleProductSelectionTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/StorefrontAdminEditDataTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/StorefrontAdminEditDataTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
index 2bdb2c3e5ab17..c0d659f1665a8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/StorefrontAdminEditDataTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontAdminEditDataTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/StorefrontEditBundleProductTest.xml
rename to app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
index 1944f82cf3181..a50a73c7f6bb4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/StorefrontEditBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -1,124 +1,124 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <test name="StorefrontEditBundleProductTest">
-        <annotations>
-            <features value="Bundle"/>
-            <stories value="Bundle products list on Storefront"/>
-            <title value="Customer should be able to change chosen options for Bundle Product when clicking Edit button in Shopping Cart page"/>
-            <description value="Customer should be able to change chosen options for Bundle Product when clicking Edit button in Shopping Cart page"/>
-            <severity value="MAJOR"/>
-            <testCaseId value="MC-290"/>
-            <group value="Bundle"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
-        </before>
-        <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-        </after>
-
-        <!-- Create a bundle product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
-        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
-        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct">
-            <argument name="product" value="BundleProduct"/>
-        </actionGroup>
-
-        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillBundleProductNameAndSku">
-            <argument name="product" value="BundleProduct"/>
-        </actionGroup>
-
-        <!-- Add two bundle items -->
-        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
-        <scrollTo stepKey="scrollToBundleItems" selector="{{AdminProductFormBundleSection.bundledItems}}"/>
-        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
-        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
-        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
-        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
-            <argument name="product" value="$$simpleProduct1$$"/>
-        </actionGroup>
-        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
-        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
-            <argument name="product" value="$$simpleProduct2$$"/>
-        </actionGroup>
-        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
-        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
-        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
-        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
-
-        <click stepKey="saveProductBundle" selector="{{AdminProductFormActionSection.saveButton}}"/>
-        <see stepKey="assertSuccess" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
-
-        <!-- Go to the storefront bundled product page -->
-        <amOnPage url="/{{BundleProduct.urlKey}}.html" stepKey="visitStoreFrontBundle"/>
-        <waitForPageLoad stepKey="waitForStorefront"/>
-        <click stepKey="customizeAndAddToCart" selector="{{StorefrontBundledSection.addToCart}}"/>
-        <waitForPageLoad stepKey="waitCustomizableOptionsPopUp"/>
-
-        <!-- add two products to the shopping cart, each with one different option -->
-        <click stepKey="selectFirstBundleOption" selector="{{StorefrontBundledSection.nthBundledOption('1','1')}}"/>
-        <waitForPageLoad stepKey="waitForPriceUpdate"/>
-        <see stepKey="seeSinglePrice" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="1,230.00"/>
-        <click stepKey="addFirstItemToCart" selector="{{StorefrontBundledSection.addToCartConfigured}}"/>
-        <waitForPageLoad stepKey="waitForElementAdded"/>
-
-        <click stepKey="unselectFirstBundleOption" selector="{{StorefrontBundledSection.nthBundledOption('1','1')}}"/>
-        <click stepKey="selectSecondBundleOption" selector="{{StorefrontBundledSection.nthBundledOption('1','2')}}"/>
-        <waitForPageLoad stepKey="waitForPriceUpdate2"/>
-        <see stepKey="seeSinglePrice2" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="1,230.00"/>
-        <click stepKey="addSecondItemToCart" selector="{{StorefrontBundledSection.addToCartConfigured}}"/>
-        <waitForPageLoad stepKey="waitForElementAdded2"/>
-
-        <!-- Go to the shopping cart page and edit the first product -->
-        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart"/>
-        <waitForPageLoad stepKey="waitForCartPageLoad"/>
-        <waitForElementVisible stepKey="waitForInfoDropdown" selector="{{CheckoutCartSummarySection.total}}"/>
-        <waitForPageLoad stepKey="waitForCartPageLoad3"/>
-        <grabTextFrom selector="{{CheckoutCartSummarySection.total}}" stepKey="grabTotalBefore"/>
-        <click stepKey="clickEdit" selector="{{CheckoutCartProductSection.nthEditButton('1')}}"/>
-        <waitForPageLoad stepKey="waitForStorefront2"/>
-
-        <!-- Choose both of the options on the storefront -->
-        <click stepKey="selectFirstBundleOption2" selector="{{StorefrontBundledSection.nthBundledOption('1','1')}}"/>
-        <click stepKey="selectSecondBundleOption2" selector="{{StorefrontBundledSection.nthBundledOption('1','2')}}"/>
-
-        <waitForPageLoad stepKey="waitForPriceUpdate3"/>
-        <see stepKey="seeDoublePrice" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="2,460.00"/>
-
-        <click stepKey="addFirstItemToCart2" selector="{{StorefrontBundledSection.updateCart}}"/>
-        <waitForPageLoad stepKey="waitForElementAdded3"/>
-
-        <!-- Go to the shopping cart page -->
-        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart2"/>
-        <waitForPageLoad stepKey="waitForCartPageLoad2"/>
-
-        <!-- Assert that the options are both there and the proce no longer matches -->
-        <see stepKey="assertBothOptions" selector="{{CheckoutCartProductSection.nthItemOption('2')}}" userInput="$$simpleProduct1.sku$$"/>
-        <see stepKey="assertBothOptions2" selector="{{CheckoutCartProductSection.nthItemOption('2')}}" userInput="$$simpleProduct2.sku$$"/>
-        <waitForElementVisible stepKey="waitForInfoDropdown2" selector="{{CheckoutCartSummarySection.total}}"/>
-        <waitForPageLoad stepKey="waitForCartPageLoad4"/>
-        <grabTextFrom selector="{{CheckoutCartSummarySection.total}}" stepKey="grabTotalAfter"/>
-        <assertNotEquals expected="{$grabTotalBefore}" expectedType="string" actual="{$grabTotalAfter}" actualType="string"  stepKey="assertNotEquals"/>
-
-        <!-- Delete the bundled product -->
-        <actionGroup stepKey="deleteBundle" ref="deleteProductUsingProductGrid">
-            <argument name="product" value="BundleProduct"/>
-        </actionGroup>
-    </test>
-</tests>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontEditBundleProductTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Bundle products list on Storefront"/>
+            <title value="Customer should be able to change chosen options for Bundle Product when clicking Edit button in Shopping Cart page"/>
+            <description value="Customer should be able to change chosen options for Bundle Product when clicking Edit button in Shopping Cart page"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-290"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+        </after>
+
+        <!-- Create a bundle product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
+        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateBundleProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillBundleProductNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add two bundle items -->
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <scrollTo stepKey="scrollToBundleItems" selector="{{AdminProductFormBundleSection.bundledItems}}"/>
+        <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions">
+            <argument name="product" value="$$simpleProduct1$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="filterBundleProductOptions2">
+            <argument name="product" value="$$simpleProduct2$$"/>
+        </actionGroup>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectFirstGridRow2"/>
+        <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
+
+        <click stepKey="saveProductBundle" selector="{{AdminProductFormActionSection.saveButton}}"/>
+        <see stepKey="assertSuccess" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
+
+        <!-- Go to the storefront bundled product page -->
+        <amOnPage url="/{{BundleProduct.urlKey}}.html" stepKey="visitStoreFrontBundle"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <click stepKey="customizeAndAddToCart" selector="{{StorefrontBundledSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitCustomizableOptionsPopUp"/>
+
+        <!-- add two products to the shopping cart, each with one different option -->
+        <click stepKey="selectFirstBundleOption" selector="{{StorefrontBundledSection.nthBundledOption('1','1')}}"/>
+        <waitForPageLoad stepKey="waitForPriceUpdate"/>
+        <see stepKey="seeSinglePrice" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="1,230.00"/>
+        <click stepKey="addFirstItemToCart" selector="{{StorefrontBundledSection.addToCartConfigured}}"/>
+        <waitForPageLoad stepKey="waitForElementAdded"/>
+
+        <click stepKey="unselectFirstBundleOption" selector="{{StorefrontBundledSection.nthBundledOption('1','1')}}"/>
+        <click stepKey="selectSecondBundleOption" selector="{{StorefrontBundledSection.nthBundledOption('1','2')}}"/>
+        <waitForPageLoad stepKey="waitForPriceUpdate2"/>
+        <see stepKey="seeSinglePrice2" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="1,230.00"/>
+        <click stepKey="addSecondItemToCart" selector="{{StorefrontBundledSection.addToCartConfigured}}"/>
+        <waitForPageLoad stepKey="waitForElementAdded2"/>
+
+        <!-- Go to the shopping cart page and edit the first product -->
+        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
+        <waitForElementVisible stepKey="waitForInfoDropdown" selector="{{CheckoutCartSummarySection.total}}"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad3"/>
+        <grabTextFrom selector="{{CheckoutCartSummarySection.total}}" stepKey="grabTotalBefore"/>
+        <click stepKey="clickEdit" selector="{{CheckoutCartProductSection.nthEditButton('1')}}"/>
+        <waitForPageLoad stepKey="waitForStorefront2"/>
+
+        <!-- Choose both of the options on the storefront -->
+        <click stepKey="selectFirstBundleOption2" selector="{{StorefrontBundledSection.nthBundledOption('1','1')}}"/>
+        <click stepKey="selectSecondBundleOption2" selector="{{StorefrontBundledSection.nthBundledOption('1','2')}}"/>
+
+        <waitForPageLoad stepKey="waitForPriceUpdate3"/>
+        <see stepKey="seeDoublePrice" selector="{{StorefrontBundledSection.configuredPrice}}" userInput="2,460.00"/>
+
+        <click stepKey="addFirstItemToCart2" selector="{{StorefrontBundledSection.updateCart}}"/>
+        <waitForPageLoad stepKey="waitForElementAdded3"/>
+
+        <!-- Go to the shopping cart page -->
+        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart2"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad2"/>
+
+        <!-- Assert that the options are both there and the proce no longer matches -->
+        <see stepKey="assertBothOptions" selector="{{CheckoutCartProductSection.nthItemOption('2')}}" userInput="$$simpleProduct1.sku$$"/>
+        <see stepKey="assertBothOptions2" selector="{{CheckoutCartProductSection.nthItemOption('2')}}" userInput="$$simpleProduct2.sku$$"/>
+        <waitForElementVisible stepKey="waitForInfoDropdown2" selector="{{CheckoutCartSummarySection.total}}"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad4"/>
+        <grabTextFrom selector="{{CheckoutCartSummarySection.total}}" stepKey="grabTotalAfter"/>
+        <assertNotEquals expected="{$grabTotalBefore}" expectedType="string" actual="{$grabTotalAfter}" actualType="string"  stepKey="assertNotEquals"/>
+
+        <!-- Delete the bundled product -->
+        <actionGroup stepKey="deleteBundle" ref="deleteProductUsingProductGrid">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/composer.json b/app/code/Magento/Bundle/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..1e379d1bacd44
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "magento/functional-test-module-bundle",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-catalog-rule": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-gift-message": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-webapi": "100.0.0-dev",
+        "magento/functional-test-module-bundle-sample-data": "100.0.0-dev",
+        "magento/functional-test-module-sales-rule": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/BundleGraphQl/Test/Mftf/README.md b/app/code/Magento/BundleGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..6c7176cbb77f9
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Bundle Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Bundle Graph Ql** module.
diff --git a/app/code/Magento/BundleGraphQl/Test/Mftf/composer.json b/app/code/Magento/BundleGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..33dffdc85a364
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-bundle-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-bundle": "100.0.0-dev",
+        "magento/functional-test-module-catalog-graph-ql": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/LICENSE.txt b/app/code/Magento/BundleImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/LICENSE.txt
rename to app/code/Magento/BundleImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/LICENSE_AFL.txt b/app/code/Magento/BundleImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/LICENSE_AFL.txt
rename to app/code/Magento/BundleImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/BundleImportExport/Test/Mftf/README.md b/app/code/Magento/BundleImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e4c6855132d05
--- /dev/null
+++ b/app/code/Magento/BundleImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Bundle Import Export Functional Tests
+
+The Functional Test Module for **Magento Bundle Import Export** module.
diff --git a/app/code/Magento/BundleImportExport/Test/Mftf/composer.json b/app/code/Magento/BundleImportExport/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..2210ef5248159
--- /dev/null
+++ b/app/code/Magento/BundleImportExport/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-bundle-import-export",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-bundle": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-import-export": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-import-export": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/LICENSE.txt b/app/code/Magento/CacheInvalidate/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/LICENSE.txt
rename to app/code/Magento/CacheInvalidate/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/LICENSE_AFL.txt b/app/code/Magento/CacheInvalidate/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/LICENSE_AFL.txt
rename to app/code/Magento/CacheInvalidate/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CacheInvalidate/Test/Mftf/README.md b/app/code/Magento/CacheInvalidate/Test/Mftf/README.md
new file mode 100644
index 0000000000000..403a6f15d089d
--- /dev/null
+++ b/app/code/Magento/CacheInvalidate/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cache Invalidate Functional Tests
+
+The Functional Test Module for **Magento Cache Invalidate** module.
diff --git a/app/code/Magento/CacheInvalidate/Test/Mftf/composer.json b/app/code/Magento/CacheInvalidate/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..0a6ffcf2f4661
--- /dev/null
+++ b/app/code/Magento/CacheInvalidate/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-cache-invalidate",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-page-cache": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/LICENSE.txt b/app/code/Magento/Captcha/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/LICENSE.txt
rename to app/code/Magento/Captcha/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/LICENSE_AFL.txt b/app/code/Magento/Captcha/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/LICENSE_AFL.txt
rename to app/code/Magento/Captcha/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Captcha/Test/Mftf/README.md b/app/code/Magento/Captcha/Test/Mftf/README.md
new file mode 100644
index 0000000000000..48be768712f2f
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Captcha Functional Tests
+
+The Functional Test Module for **Magento Captcha** module.
diff --git a/app/code/Magento/Captcha/Test/Mftf/composer.json b/app/code/Magento/Captcha/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..95c3aa5f76078
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-captcha",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AddProductToCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AddProductToCartActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
index 9380c3052a5f5..44c960dc37641 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AddProductToCartActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductToCartActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AddSimpleProductToCart">
         <arguments>
             <argument name="product" defaultValue="product"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
index 1125a776bbdbd..7c04e9bd83d56 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Create a new category-->
     <actionGroup name="CreateCategory">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCreateRootCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCreateRootCategoryActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml
index b29a03b6d1819..e7d9a63484bc6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCreateRootCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateRootCategoryActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Create a new root category-->
     <actionGroup name="AdminCreateRootCategory">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 3ef8b961a81af..db148b2cf3114 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Navigate to create product page from product grid page-->
     <actionGroup name="goToCreateProductPage">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductAttributeActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index d3d6f13386856..3f4ee180fc65f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="navigateToCreatedProductAttribute">
         <arguments>
             <argument name="ProductAttribute"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductAttributeSetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductAttributeSetActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
index 19e5bed0913a3..33f4ccac2b98f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductAttributeSetActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssignAttributeToGroup">
         <arguments>
             <argument name="group" type="string"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductGridActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index 5f2c45b829780..9d6af144b8f22 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Reset the product grid to the default view-->
     <actionGroup name="resetProductGridToDefaultView">
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
index cfaf91e4788a8..4eca49dc28b57 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertProductInStorefrontCategoryPage">
         <arguments>
             <argument name="category"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
index 3d4195d92f2c7..59c874b8481d3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertProductInStorefrontProductPage">
         <arguments>
             <argument name="product"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml
index 48a6c635c9d8d..304f38e227960 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckItemInLayeredNavigationActionGroup.xml
@@ -6,7 +6,7 @@
  */
 -->
 
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CheckItemInLayeredNavigationActionGroup">
         <arguments>
             <argument name="itemType"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/CustomOptionsActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
index 0409c3f195013..e8097cfa4fffb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/CustomOptionsActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
 
 
     <actionGroup name="CreateCustomRadioOptions">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/MoveCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/MoveCategoryActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml
index 9a082efa75db6..ae9dc0557a9bd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/MoveCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/MoveCategoryActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="MoveCategoryActionGroup">
         <arguments>
             <argument name="childCategory"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/OpenEditProductOnBackendActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenEditProductOnBackendActionGroup.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/OpenEditProductOnBackendActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenEditProductOnBackendActionGroup.xml
index 0dfa28275f796..07fba7cc6be06 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/OpenEditProductOnBackendActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenEditProductOnBackendActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="OpenEditProductOnBackendActionGroup">
         <arguments>
             <argument name="product" defaultValue="product"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/OpenProductFromCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductFromCategoryPageActionGroup.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/OpenProductFromCategoryPageActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductFromCategoryPageActionGroup.xml
index c76153f7be768..e8794ab895c6b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/OpenProductFromCategoryPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductFromCategoryPageActionGroup.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
 -->
 
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="OpenProductFromCategoryPageActionGroup">
         <arguments>
             <argument name="category"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/RestoreLayoutSettingActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/RestoreLayoutSettingActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
index b9119a5ab9ff2..53acfe2b4372d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/RestoreLayoutSettingActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="RestoreLayoutSetting">
         <selectOption selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="No layout updates" stepKey="selectNoLayoutUpdates1" after="expandDefaultLayouts"/>
         <selectOption selector="{{DefaultLayoutsSection.productLayout}}" userInput="No layout updates" stepKey="selectNoLayoutUpdates2" before="clickSaveConfig"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SearchAndMultiselectActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAndMultiselectActionGroup.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SearchAndMultiselectActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAndMultiselectActionGroup.xml
index 784c40808f63b..943fe803232e6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SearchAndMultiselectActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchAndMultiselectActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="searchAndMultiSelectActionGroup">
         <arguments>
             <argument name="dropDownSelector" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SearchForProductOnBackendActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SearchForProductOnBackendActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
index a0416802498f4..5fbc9c5d7fcad 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/SearchForProductOnBackendActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SearchForProductOnBackendActionGroup">
         <arguments>
             <argument name="product" defaultValue="product"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
index 9cf32a9103fa8..105a5c58788de 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAddToCartCustomOptionsProductPageActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Click Add to Cart button in storefront product page-->
     <actionGroup name="StorefrontAddToCartCustomOptionsProductPageActionGroup">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCategoryActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
index 3b04df7fdd115..05a2adf8ad7d1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Check the category page -->
     <actionGroup name="StorefrontCheckCategoryActionGroup">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCompareActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCompareActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
index 86141fede78ff..7af1cacfb3da8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCompareActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Add Product to Compare from the category page and check message -->
     <actionGroup name="StorefrontAddCategoryProductToCompareActionGroup">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
index 7673ce6874482..eb672cd162e82 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Check the simple product on the product page -->
     <actionGroup name="StorefrontCheckSimpleProduct">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductPageActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml
index f763b0c3d2768..d688a1dc2844e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontProductPageActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Click Add to Cart button in storefront product page-->
     <actionGroup name="addToCartFromStorefrontProductPage">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CategoryData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index 9ce257942b30d..42351741d9fa8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultCategory" type="category">
         <data key="name" unique="suffix">simpleCategory</data>
         <data key="name_lwr" unique="suffix">simplecategory</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ConstData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ConstData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
index b26fa64bceae9..8ae57f9239902 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ConstData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
     <entity name="CONST" type="CONST">
         <data key="one">1</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
index c0f2e391a4e2b..e93138fecfd47 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/CustomAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
@@ -6,7 +6,7 @@
   */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="CustomAttributeCategoryUrlKey" type="custom_attribute">
         <data key="attribute_code">url_key</data>
         <data key="value" unique="suffix">category</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/FrontendLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/FrontendLabelData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
index 96104f632798e..2423383bc19f7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/FrontendLabelData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/FrontendLabelData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ProductAttributeFrontendLabel" type="FrontendLabel">
         <data key="store_id">0</data>
         <data key="label" unique="suffix">attribute</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ImageContentData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ImageContentData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml
index 79842ccb47e31..c674a8fc144ce 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ImageContentData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ImageContentData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
    <entity name="TestImageContent" type="ImageContent">
         <data key="base64_encoded_data">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDIBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAGAAYAMBIgACEQEDEQH/xACXAAEBAAMBAQEBAAAAAAAAAAAABgMEBQgCAQcQAAEDAQUFBgQDCQAAAAAAAAABAgMEBQYRFpESMTZV0QchcnOzwhMUIkEygaE1QlFSYXGCsbIBAAEFAQAAAAAAAAAAAAAAAAACAwQGBwERAAECAwMLBAMBAAAAAAAAAAEAAgMEERMhkRQxMzRBUVJTcXKxBRJhoSKBwUL/2gAMAwEAAhEDEQA/AP7+AYKysp7Po5aurlbFBEmL3u3NQ6ASaBdArcFnBN5/urzqn0d0Gf7q86p9HdCRkUzy3YFOWEXhOCpATef7q86p9HdBn+6vOqfR3QMimeW7AosIvCcFSAm8/wB1edU+jugz/dXnVPo7oGRTPLdgUWEXhOCpATef7q86p9HdBn+6vOqfR3QMimeW7AosIvCcFSA1bPtGktWiZWUM7Z6d6qjZG7lwXBf1Q2iO5paaOFCmyCDQoTd/uBLX8n3IUhN3+4EtfyfchIk9Zh9w8pyBpW9QvN4Bwbcsujis+pq2Q4Tq5HbW0u9XJj3Y4fc0ibjPgQjEY0GgJNTS4brj/FaIz3Q2FwFafNP4V3gc1aWz7FY+rjhVrsNjBrlcrsV3Iir/ABPxtqzRyM+boJKeJ7kakm2jkRV3Yom4TlbYf4xrnfFSBuqaCn7ouWwbc+4/FT90XTBz57RlbVvpqWjdUSRoiyfWjUbju71MUlqSyWdVPjpnsqIUVJI3ORFZ3fix+4OnoLSRU3V2HZnANKEjcEGOwVG74OxdUGjZM1RNQROqIlYuw3Zcr9pXpgn1f0xN4kQYgiww8bU4xwe0OG1eg+y7gCg8cvqOLEjuy7gCg8cvqOLEzT1HXIvcfKq0zpn9ShN3+4EtfyfchSE3f7gS1/J9yCJPWYfcPKTA0reoXm85l4P2HUf4/wDSHTPmSOOZiskY17F3tcmKKaXMwjGgvhj/AECMQrTFZ72ObvC5lvxq+gjeivRsUzXvVn4kb34qmpozxWc+NjVtWtqPiOREjbMj1Vf7YFHvMMdLTxP244ImP/maxEUhzMhaxC8UvABrXZuoR9pmLL+9xddfvXNrfkVtJyPqJaOpRiL8VHbKPT8+5THFVS1FnWnE+VKhsUbmsmamG3i1e78jsSwQzoiTRRyIm5HtRf8AZ9MjZGxGMY1rU/damCHTJPMQuDgAa5q31G0VpdnrnuRYO9xNaA1+/r9rUsmeGazqdscrHuZExHo1cVauH30U3THFBDBtfBijj2t+w1Ex0MhMgMcyG1r843J+GC1oDs69B9l3AFB45fUcWJHdl3AFB45fUcWJm3qOuRe4+VV5nTP6lCbv9wJa/k+5CkJu/wBwJa/k+5BEnrMPuHlJgaVvULzeADUlbUAAIQAAhAACF6D7LuAKDxy+o4sSO7LuAKDxy+o4sTMPUdci9x8qqTOmf1KE3f7gS1/J9yFITd/uBLX8n3IIk9Zh9w8pMDSt6hebwAakragABCAAEIAAQvQfZdwBQeOX1HFiR3ZdwBQeOX1HFiZh6jrkXuPlVSZ0z+pQwVlHT2hRy0lXE2WCVMHsduchnBEBINQmQaXhTeQLq8lp9XdRkC6vJafV3UpASMtmeY7Epy3i8RxU3kC6vJafV3UZAuryWn1d1KQBlszzHYlFvF4jipvIF1eS0+ruoyBdXktPq7qUgDLZnmOxKLeLxHFTeQLq8lp9XdRkC6vJafV3UpAGWzPMdiUW8XiOK1bPs6ksqiZR0MDYKdiqrY27kxXFf1U2gCO5xcauNSmySTUr/9k=</data>
         <data key="type">image/jpeg</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
index ab0eac4960dc6..c8983b2090928 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="productAttributeWysiwyg" type="ProductAttribute">
         <data key="attribute_code" unique="suffix">attribute</data>
         <data key="frontend_input">textarea</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeMediaGalleryEntryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeMediaGalleryEntryData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
index 5dee0651064a3..60b38812e4ced 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeMediaGalleryEntryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeMediaGalleryEntryData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ApiProductAttributeMediaGalleryEntryTestImage" type="ProductAttributeMediaGalleryEntry">
         <data key="media_type">image</data>
         <data key="label" unique="suffix">Test Image </data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeOptionData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
index 22d0e83d7b338..2fc451e6d40fd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeOptionData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="productAttributeOption1" type="ProductAttributeOption">
         <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
         <data key="label" unique="suffix">option1</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeSetData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
index 579f592e44ee9..68c0a54ff88fc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductAttributeSetData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="AddToDefaultSet" type="ProductAttributeSet">
         <var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
         <data key="attributeSetId">4</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 3c6e7d3ddc319..677214011c987 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultProduct" type="product">
         <data key="sku" unique="suffix">testSku</data>
         <data key="type_id">simple</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductExtensionAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
similarity index 63%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductExtensionAttributeData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
index 39cd17effeffc..0f6b383c3b743 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductExtensionAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="EavStockItem" type="product_extension_attribute">
         <requiredEntity type="stock_item">Qty_1000</requiredEntity>
     </entity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductGridData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
similarity index 62%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductGridData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
index f1f5d342e4804..b123800a6cc84 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductGridData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductGridData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="PriceFilterRange" type="filter">
         <data key="from">10</data>
         <data key="to">100</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductOptionData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
index 2abc557d44d96..95905eb90d926 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductOptionData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ProductOptionField" type="product_option">
         <var key="product_sku" entityType="product" entityKey="sku" />
         <data key="title">OptionField</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductOptionValueData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductOptionValueData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
index 615f6aaa705bf..815f8cf16809b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductOptionValueData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionValueData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ProductOptionValueDropdown1" type="product_option_value">
         <data key="title">OptionValueDropDown1</data>
         <data key="sort_order">1</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StockItemData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
similarity index 63%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StockItemData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
index d76370d4ea0d2..46a3fa3657f2c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StockItemData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="Qty_1000" type="stock_item">
         <data key="qty">1000</data>
         <data key="is_in_stock">true</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StoreLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StoreLabelData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
index 1a1d781de448c..097b388f45ea0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/StoreLabelData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="Option1Store0" type="StoreLabel">
         <data key="store_id">0</data>
         <data key="label">option1</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/LICENSE.txt b/app/code/Magento/Catalog/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/LICENSE.txt
rename to app/code/Magento/Catalog/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/LICENSE_AFL.txt b/app/code/Magento/Catalog/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/LICENSE_AFL.txt
rename to app/code/Magento/Catalog/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/category-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/category-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
index 2699499a49900..0880315db5d6b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/category-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/category-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateCategory" dataType="category" type="create" auth="adminOauth" url="/V1/categories" method="POST">
         <contentType>application/json</contentType>
         <object key="category" dataType="category">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/custom_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/custom_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
index e245a3b8bf8b9..aed9b7a979836 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/custom_attribute-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/custom_attribute-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateCustomAttribute" dataType="custom_attribute" type="create">
         <field key="attribute_code">string</field>
         <field key="value">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/empty_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/empty_extension_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
index 1ec100a367a5b..d8410593cb5b4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/empty_extension_attribute-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/empty_extension_attribute-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateEmptyExtensionAttribute" dataType="empty_extension_attribute" type="create">
     </operation>
     <operation name="UpdateEmptyExtensionAttribute" dataType="empty_extension_attribute" type="update">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/frontend_label-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/frontend_label-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
index 47769888dc8eb..d0bcbd3e5db97 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/frontend_label-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/frontend_label-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateFrontendLabel" dataType="FrontendLabel" type="create">
         <field key="store_id">integer</field>
         <field key="label">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
index b04b4bb98c854..212de2b39d363 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProduct" dataType="product" type="create" auth="adminOauth" url="/V1/products" method="POST">
         <contentType>application/json</contentType>
         <object dataType="product" key="product">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml
index bb09a0c86e50c..93396352ba506 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductAttribute" dataType="ProductAttribute" type="create" auth="adminOauth" url="/V1/products/attributes" method="POST">
         <contentType>application/json</contentType>
         <object dataType="ProductAttribute" key="attribute">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_media_gallery_entry-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_media_gallery_entry-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml
index 1697941013156..8033e8c33a349 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_media_gallery_entry-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_media_gallery_entry-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductAttributeMediaGalleryEntry" dataType="ProductAttributeMediaGalleryEntry" type="create" auth="adminOauth" url="/V1/products/{sku}/media" method="POST">
         <contentType>application/json</contentType>
         <object key="entry" dataType="ProductAttributeMediaGalleryEntry">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_option-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_option-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml
index 1b4f5d1a5254c..176afa8d58d7c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_option-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_option-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductAttributeOption" dataType="ProductAttributeOption" type="create" auth="adminOauth" url="/V1/products/attributes/{attribute_code}/options" method="POST">
         <contentType>application/json</contentType>
         <object dataType="ProductAttributeOption" key="option">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_set-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_set-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml
index 7b5e96d707573..eef82b07aaf4f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_attribute_set-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_attribute_set-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="AddProductAttributeToAttributeSet" dataType="ProductAttributeSet" type="create" auth="adminOauth" url="/V1/products/attribute-sets/attributes" method="POST">
         <contentType>application/json</contentType>
         <field key="attributeSetId">integer</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_extension_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml
index fa19659be032e..8d0d1e66c81e3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_extension_attribute-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_extension_attribute-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductExtensionAttribute" dataType="product_extension_attribute" type="create">
         <field key="stock_item">stock_item</field>
     </operation>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml
index 899dc3a7f4a8c..5e631b2ea3a28 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductLink" dataType="product_link" type="create">
         <field key="sku">string</field>
         <field key="link_type">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link_extension_attribute-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link_extension_attribute-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml
index 03527349541dc..07ea02f5b7aee 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_link_extension_attribute-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_link_extension_attribute-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductLinkExtensionAttribute" dataType="product_link_extension_attribute" type="create">
         <contentType>application/json</contentType>
         <field key="qty">integer</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_links-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_links-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml
index 34e8d0fca6833..56b3ee25ef735 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_links-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_links-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductLinks" dataType="product_links" type="create" auth="adminOauth" url="/V1/products/{sku}/links" method="POST">
         <contentType>application/json</contentType>
         <array key="items">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml
index 730caf69113d6..adc5a33507af6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductOption" dataType="product_option" type="create">
         <field key="product_sku">string</field>
         <field key="option_id">integer</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option_value-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml
similarity index 82%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option_value-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml
index 47c5195b19172..f4273f5796830 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/product_option_value-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/product_option_value-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductOptionValue" dataType="product_option_value" type="create">
         <field key="title">string</field>
         <field key="sort_order">integer</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/stock_item-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/stock_item-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml
index eb3413be61fd3..e7e79d69055c6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/stock_item-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/stock_item-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateStockItem" dataType="stock_item" type="create">
         <field key="qty">integer</field>
         <field key="is_in_stock">boolean</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/store_label-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/store_label-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml
index 8b1eae6d885dd..abb9b003dc59e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/store_label-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/store_label-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateStoreLabel" dataType="StoreLabel" type="create">
         <field key="store_id">integer</field>
         <field key="label">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/validation_rule-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/validation_rule-meta.xml
rename to app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml
index 2d4eac0a971ef..c568e52b2ab3c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Metadata/validation_rule-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/validation_rule-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateValidationRule" dataType="validation_rule" type="create">
         <field key="key">string</field>
         <field key="value">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
similarity index 82%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryEditPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
index 95e80238d4af6..cfefa8cb2c4bc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryEditPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminCategoryEditPage" url="catalog/category/edit/id/{{categoryId}}/" area="admin" module="Catalog" parameterized="true">
         <section name="AdminCategorySidebarActionSection"/>
         <section name="AdminCategoryMainActionsSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
index 7d0e7f4f99e42..7cabe0e18f0b6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminCategoryPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminCategoryPage" url="catalog/category/" area="admin" module="Catalog">
         <section name="AdminCategorySidebarActionSection"/>
         <section name="AdminCategoryMainActionsSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeFormPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeFormPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
index 4339f2615e780..b04aff5f161da 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeFormPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml
@@ -6,7 +6,7 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="ProductAttributePage" url="catalog/product_attribute/new/" area="admin" module="Catalog">
         <section name="AdminCreateProductAttributeSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeGridPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeGridPage.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeGridPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeGridPage.xml
index ce8f33fa57433..a5de7453d9c23 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeGridPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeGridPage.xml
@@ -6,7 +6,7 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminProductAttributeGridPage" url="catalog/product_attribute" area="admin" module="Catalog">
         <section name="AdminProductAttributeGridSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeSetEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetEditPage.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeSetEditPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetEditPage.xml
index 42a5be5e31334..4034f2ab075d4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeSetEditPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetEditPage.xml
@@ -6,7 +6,7 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminProductAttributeSetEditPage" url="catalog/product_set/edit/id" area="admin" module="Catalog">
         <section name="AdminProductAttributeSetEditSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeSetGridPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetGridPage.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeSetGridPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetGridPage.xml
index 574b5891dc2ef..0d879768eb494 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributeSetGridPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeSetGridPage.xml
@@ -6,7 +6,7 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminProductAttributeSetGridPage" url="catalog/product_set/" area="admin" module="ProductAttributeSet">
         <section name="AdminProductAttributeSetGridSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributesEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributesEditPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml
index e9a40a7541a98..4918041d2cd88 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductAttributesEditPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributesEditPage.xml
@@ -6,7 +6,7 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="ProductAttributesEditPage" url="catalog/product_action_attribute/edit/" area="admin" module="Catalog">
         <section name="AdminEditProductAttributesSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductCreatePage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductCreatePage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
index 305dcb59704f8..35fa00efcfe8e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
         <section name="AdminProductFormSection"/>
         <section name="AdminProductFormActionSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductEditPage.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/AdminProductEditPage.xml
index a08c3e5fb1fec..9312d4dfcfbe9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductEditPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductEditPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminProductEditPage" url="catalog/product/edit/id/{{productId}}/" area="admin" module="Magento_Catalog" parameterized="true">
         <!-- This page object only exists for the url. Use the AdminProductCreatePage for selectors. -->
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductIndexPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductIndexPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml
index 492cb0c95407a..66cd691176268 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductIndexPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminProductIndexPage.xml
@@ -6,7 +6,7 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminProductIndexPage" url="catalog/product/index" area="admin" module="Magento_Catalog">
         <section name="AdminProductGridActionSection" />
         <section name="AdminProductGridFilterSection" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/ProductCatalogPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/ProductCatalogPage.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/ProductCatalogPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/ProductCatalogPage.xml
index e56cc122c44cb..742b46fcaf7ed 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/ProductCatalogPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/ProductCatalogPage.xml
@@ -7,7 +7,7 @@
  -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="ProductCatalogPage" url="/catalog/product/" area="admin" module="Magento_Catalog">
         <section name="ProductCatalogPageSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontCategoryPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontCategoryPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
index ac699e55f45b2..c5b9fe869558e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontCategoryPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontCategoryPage" url="/{{var1}}.html" area="storefront" module="Catalog" parameterized="true">
         <section name="StorefrontCategoryMainSection"/>
         <section name="WYSIWYGToolbarSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductComparePage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductComparePage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductComparePage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductComparePage.xml
index e110ee7f3bc61..f0599a021d4c4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductComparePage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductComparePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontProductComparePage" url="catalog/product_compare/index" module="Magento_Catalog" area="storefront">
         <section name="StorefrontProductCompareMainSection" />
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductPage.xml
rename to app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
index d6e135e9af24f..8fd59585938be 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontProductPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontProductPage" url="/{{var1}}.html" area="storefront" module="Catalog" parameterized="true">
         <section name="StorefrontProductInfoMainSection" />
         <section name="StorefrontProductInfoDetailsSection" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/README.md b/app/code/Magento/Catalog/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e7a95609c394b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Functional Tests
+
+The Functional Test Module for **Magento Catalog** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminAddProductsToOptionPanelSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminAddProductsToOptionPanelSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminAddProductsToOptionPanelSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminAddProductsToOptionPanelSection.xml
index 42d92966e3d45..7723e0fe330cd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminAddProductsToOptionPanelSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminAddProductsToOptionPanelSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminAddProductsToOptionPanel">
         <element name="addSelectedProducts" type="button" selector=".product_form_product_form_bundle-items_modal button.action-primary" timeout="30"/>
         <element name="filters" type="button" selector=".product_form_product_form_bundle-items_modal button[data-action='grid-filter-expand']" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
index 7de2390e5348a..3ed3763da19d6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategoryBasicFieldSection">
         <element name="IncludeInMenu" type="checkbox" selector="input[name='include_in_menu']"/>
         <element name="includeInMenuLabel" type="text" selector="input[name='include_in_menu']+label"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
similarity index 82%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryContentSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
index d0e129e1bb441..59537274f23c9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryContentSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategoryContentSection">
         <element name="sectionHeader" type="button" selector="div[data-index='content']" timeout="30"/>
         <element name="uploadButton" type="button" selector="//*[@class='file-uploader-area']/label[text()='Upload']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
index e726e5bfb7c63..60a6d852bf6ef 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategoryMainActionsSection">
         <element name="SaveButton" type="button" selector=".page-actions-inner #save" timeout="30"/>
         <element name="DeleteButton" type="button" selector=".page-actions-inner #delete" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
similarity index 64%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMessagesSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
index e78a7f06927d8..1214cfd2eb224 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMessagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMessagesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategoryMessagesSection">
         <element name="SuccessMessage" type="text" selector=".message-success"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryModalSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryModalSection.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryModalSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryModalSection.xml
index d36256bf75d81..03b9d76778555 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryModalSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryModalSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategoryModalSection">
         <element name="message" type="text" selector="aside.confirm div.modal-content"/>
         <element name="title" type="text" selector="aside.confirm .modal-header .modal-title"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryProductsGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryProductsGridSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
index e5370c60ef570..540a97fd04e36 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryProductsGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategoryProductsGridSection">
         <element name="rowProductId" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-id" parameterized="true"/>
         <element name="rowProductName" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-name" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryProductsSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
index 8d2bf3f572a0e..dc254bdf15982 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryProductsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategoryProductsSection">
         <element name="sectionHeader" type="button" selector="div[data-index='assign_products']" timeout="30"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml
index 0e01660d5fce9..35852abe3505e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySEOSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategorySEOSection">
         <element name="SectionHeader" type="button" selector="div[data-index='search_engine_optimization']" timeout="30"/>
         <element name="UrlKeyInput" type="input" selector="input[name='url_key']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarActionSection.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarActionSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarActionSection.xml
index b6d3bee0cc01b..e53a9989d661c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarActionSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarActionSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategorySidebarActionSection">
         <element name="AddRootCategoryButton" type="button" selector="#add_root_category_button" timeout="30"/>
         <element name="AddSubcategoryButton" type="button" selector="#add_subcategory_button" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
index 5e080bbb7fdba..524fac78bc1c1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategorySidebarTreeSection">
         <element name="collapseAll" type="button" selector=".tree-actions a:first-child"/>
         <element name="expandAll" type="button" selector=".tree-actions a:last-child"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryWarningMessagesPopupSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryWarningMessagesPopupSection.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryWarningMessagesPopupSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryWarningMessagesPopupSection.xml
index b95f0d8bd2141..82b3b76df3d2e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryWarningMessagesPopupSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryWarningMessagesPopupSection.xml
@@ -6,7 +6,7 @@
  */
 -->
 
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategoryWarningMessagesPopupSection">
         <element name="warningMessage" type="text" selector=".modal-inner-wrap .modal-content .message.message-notice"/>
         <element name="cancelButton" type="button" selector=".modal-inner-wrap .action-secondary"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCreateProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCreateProductAttributeSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
index 362a039e34122..e1eef15e9d476 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCreateProductAttributeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AttributePropertiesSection">
         <element name="DefaultLabel" type="input" selector="#attribute_label"/>
         <element name="InputType" type="select" selector="#frontend_input"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminEditProductAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminEditProductAttributesSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
index bb0343c3a85c0..703e9e7ec70ac 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminEditProductAttributesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminEditProductAttributesSection">
         <element name="AttributeName" type="text" selector="#name"/>
         <element name="ChangeAttributeNameToggle" type="checkbox" selector="#toggle_name"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
similarity index 82%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeGridSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
index f1347643cbd9d..820e03a0f5e98 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductAttributeGridSection">
         <element name="AttributeCode" type="text" selector="//td[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="createNewAttributeBtn" type="button" selector="button[data-index='add_new_attribute_button']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetActionSection.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetActionSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetActionSection.xml
index 280c41ae4206e..4c309584d4d56 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetActionSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetActionSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductAttributeSetActionSection">
         <element name="save" type="button" selector="button[title='Save']" timeout="30"/>
         <element name="reset" type="button" selector="button[title='Reset']" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetEditSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetEditSection.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetEditSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetEditSection.xml
index 9a69761ee1550..a2193bcafbb01 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetEditSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetEditSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductAttributeSetEditSection">
         <!-- Groups Column -->
         <element name="groupTree" type="block" selector="#tree-div1"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetGridSection.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetGridSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetGridSection.xml
index 0df7cbc65d6c5..08724222a3885 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetGridSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductAttributeSetGridSection">
         <element name="filter" type="input" selector="#setGrid_filter_set_name"/>
         <element name="searchBtn" type="button" selector="#container button[title='Search']" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml
index 2c99945b0989e..9e320d9e8b08d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductAttributeSetSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductAttributeSetSection">
         <element name="name" type="input" selector="#attribute_set_name"/>
         <element name="basedOn" type="select" selector="#skeleton_set"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCategoryCreationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCategoryCreationSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml
index a4566115099ef..81290bf281a56 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCategoryCreationSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductCategoryCreationSection">
         <element name="firstExampleProduct" type="button" selector=".data-row:nth-of-type(1)"/>
         <element name="newCategory" type="button" selector="//button/span[text()='New Category']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductContentSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
index 12a00ae8b3777..b73c630d6d963 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductContentSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductContentSection">
         <element name="sectionHeader" type="button" selector="div[data-index='content']" timeout="30"/>
         <element name="descriptionTextArea" type="textarea" selector="#product_form_description"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCustomizableOptionsSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
index cb80dade856a7..8a6b5bf5eb842 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCustomizableOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductCustomizableOptionsSection">
         <element name="checkIfCustomizableOptionsTabOpen" type="text" selector="//span[text()='Customizable Options']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
         <element name="customezableOptions" type="text" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Customizable Options']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFiltersSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFiltersSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml
index 2ad371f7c51bc..4c6c1020e190d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFiltersSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFiltersSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductFiltersSection">
         <element name="filtersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button"/>
         <element name="clearFiltersButton" type="button" selector="//div[@class='admin__data-grid-header']//button[@class='action-tertiary action-clear']" timeout="10"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml
index e55a45d590910..ad6b5feb4e09e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormActionSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductFormActionSection">
         <element name="backButton" type="button" selector="#back" timeout="30"/>
         <element name="saveButton" type="button" selector="#save-button" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormChangeStoreSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormChangeStoreSection.xml
similarity index 72%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormChangeStoreSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormChangeStoreSection.xml
index 15654534efd3e..8c9e92d912bf3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormChangeStoreSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormChangeStoreSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductFormChangeStoreSection">
         <element name="storeSelector" type="button" selector="//a[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="acceptButton" type="button" selector="button[class='action-primary action-accept']" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 7c1c578d96997..dd297bf301fa0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductFormSection">
         <element name="attributeSet" type="select" selector="div[data-index='attribute_set_id'] .admin__field-control"/>
         <element name="attributeSetFilter" type="input" selector="div[data-index='attribute_set_id'] .admin__field-control input" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridActionSection.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridActionSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridActionSection.xml
index e43791470ead0..4ce9580405a97 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridActionSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridActionSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductGridActionSection">
         <element name="addProductToggle" type="button" selector=".action-toggle.primary.add"/>
         <element name="addSimpleProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-simple']" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridConfirmActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridConfirmActionSection.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridConfirmActionSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridConfirmActionSection.xml
index c9ea9993c7bd3..d8567df81b6b3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridConfirmActionSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridConfirmActionSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductGridConfirmActionSection">
         <element name="title" type="text" selector=".modal-popup.confirm h1.modal-title"/>
         <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridFilterSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index b0b8d90c8625e..4683576bf9516 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductGridFilterSection">
         <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
         <element name="clearAll" type="button" selector=".admin__data-grid-header .admin__data-grid-filters-current._show .action-clear" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridPaginationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridPaginationSection.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridPaginationSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridPaginationSection.xml
index a60791b3e23db..9ef89e1260fa4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridPaginationSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridPaginationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductGridPaginationSection">
         <element name="perPageDropdown" type="select" selector=".admin__data-grid-pager-wrap .selectmenu"/>
         <element name="perPageOption" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//button[text()='{{label}}']" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
index 9e1239a69ab23..de3c2b731a3d5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductGridSection">
         <element name="loadingMask" type="text" selector=".admin__data-grid-loading-mask[data-component*='product_listing']"/>
         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridTableHeaderSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridTableHeaderSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml
index 7b9fe410f7c94..fc6ccea20d3c2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridTableHeaderSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridTableHeaderSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductGridTableHeaderSection">
         <element name="id" type="button" selector=".//*[@class='sticky-header']/following-sibling::*//th[@class='data-grid-th _sortable _draggable _{{order}}']/span[text()='ID']" parameterized="true"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductImagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductImagesSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
index 2133781df0575..ce10b1e52aeb0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductImagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductImagesSection">
         <element name="productImagesToggle" type="button" selector="div[data-index=gallery] .admin__collapsible-title"/>
         <element name="imageFileUpload" type="input" selector="#fileupload"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMessagesSection.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMessagesSection.xml
index f88f8c72c64e1..5f2e6bd6cf721 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMessagesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductMessagesSection">
         <element name="successMessage" type="text" selector=".message-success"/>
         <element name="errorMessage" type="text" selector=".message.message-error.error"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductModalSlideGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductModalSlideGridSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml
index 746b95f4201ec..bef213e6cdae0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductModalSlideGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductModalSlideGridSection">
         <element name="productGridXRowYColumnButton" type="input" selector=".modal-slide table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductRelatedUpSellCrossSellSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductRelatedUpSellCrossSellSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
index 225bedb6fd2e6..636a7b5c85e8d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductRelatedUpSellCrossSellSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductFormRelatedUpSellCrossSellSection">
         <element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']" timeout="30"/>
         <element name="relatedProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='related']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductSEOSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductSEOSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
index 4b419c9d85a2c..1d49d05363612 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductSEOSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductSEOSection">
         <element name="sectionHeader" type="button" selector="div[data-index='search-engine-optimization']" timeout="30"/>
         <element name="urlKeyInput" type="input" selector="input[name='product[url_key]']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminUpdateAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminUpdateAttributesSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml
index 7ef8d7706ba20..3048f0e3f5669 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminUpdateAttributesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminUpdateAttributesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminUpdateAttributesSection">
         <element name="saveButton" type="button" selector="button[title='Save']" timeout="30"/>
 
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryFilterSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml
index 8f612e4d99e45..631cb36e16817 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryFilterSection">
         <element name="CategoryFilter" type="button" selector="//main//div[@class='filter-options']//div[contains(text(), 'Category')]"/>
         <element name="CategoryByName" type="button" selector="//main//div[@class='filter-options']//li[@class='item']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
index 45a85386fe726..a60e3bb05cc92 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryMainSection">
         <element name="modeListButton" type="button" selector="#mode-list"/>
         <element name="CategoryTitle" type="text" selector="#page-title-heading span"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryProductSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index aaec0600f8bf7..923414e60cf5f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryProductSection">
         <element name="ProductTitleByNumber" type="button" selector="//main//li[{{var1}}]//a[@class='product-item-link']" parameterized="true"/>
         <element name="ProductPriceByNumber" type="text" selector="//main//li[{{var1}}]//span[@class='price']" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategorySidebarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategorySidebarSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
index 406e9f5abd434..9cd35f65c297a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategorySidebarSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
@@ -6,7 +6,7 @@
  */
 -->
 
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCategorySidebarSection">
         <element name="filterOptionsTitle" type="text" selector="//div[@class='filter-options-title' and contains(text(), '{{var1}}')]" parameterized="true"/>
         <element name="filterOptions" type="text" selector=".filter-options-content .items"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontComparisonSidebarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontComparisonSidebarSection.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontComparisonSidebarSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontComparisonSidebarSection.xml
index 615d37f75cd48..0fdda3eaae952 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontComparisonSidebarSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontComparisonSidebarSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontComparisonSidebarSection">
         <element name="Compare" type="button" selector="//main//div[contains(@class, 'block-compare')]//a[contains(@class, 'action compare')]"/>
         <element name="ClearAll" type="button" selector="//main//div[contains(@class, 'block-compare')]//a[contains(@class, 'action clear')]"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontFooterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontFooterSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml
index 6cd64712aa70c..cf956004ae498 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontFooterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontFooterSection">
         <element name="switchStoreButton" type="button" selector="#switcher-store-trigger"/>
         <element name="storeLink" type="button" selector="//ul[@class='dropdown switcher-dropdown']//a[contains(text(),'{{var1}}')]" parameterized="true" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontHeaderSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontHeaderSection.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontHeaderSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontHeaderSection.xml
index dbca5f06a1413..6b0130eefc39b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontHeaderSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontHeaderSection">
         <element name="NavigationCategoryByName" type="button" selector="//nav//a[span[contains(., '{{var1}}')]]" parameterized="true"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
index 5f3851ad9b20d..1a9406b9975e6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontMessagesSection">
         <element name="success" type="text" selector="div.message-success.success.message"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontNavigationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontNavigationSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
index 285640ec6a30a..ad575b640bd20 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontNavigationSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
@@ -6,7 +6,7 @@
  */
 -->
 
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontNavigationSection">
         <element name="topCategory" type="button" selector="//a[contains(@class,'level-top')]/span[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="subCategory" type="button" selector="//ul[contains(@class,'submenu')]//span[contains(text(),'{{var1}}')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProducRelatedProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml
similarity index 82%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProducRelatedProductsSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml
index 9165697051d0f..e15723582dbf0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProducRelatedProductsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProducRelatedProductsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductRelatedProductsSection">
         <element name="relatedProductsActionsHeaderText" type="text" selector=".block.related .block-actions" />
         <element name="relatedProductsListSectionText" type="text" selector=".block.related .products.wrapper.grid.products-grid.products-related" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
index c2360efc05fa4..65d6b7c5f61cb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductActionSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductActionSection">
         <element name="quantity" type="input" selector="#qty"/>
         <element name="addToCart" type="button" selector="#product-addtocart-button"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductCompareMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductCompareMainSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
index cd7e7637b2766..728f9a5a174cd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductCompareMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductCompareMainSection">
         <element name="PageName" type="text" selector="//*[@id='maincontent']//h1//span"/>
         <element name="ProductLinkByName" type="button" selector="//*[@id='product-comparison']//tr//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoDetailsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoDetailsSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml
index b66590871c011..40f49fc2cc77b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoDetailsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoDetailsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoDetailsSection">
         <element name="productNameForReview" type="text" selector=".legend.review-legend>strong" />
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index a981f125c5e90..f0ca8cb74e3e1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoMainSection">
         <element name="stock" type="input" selector=".stock.available"/>
         <element name="productName" type="text" selector=".base"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductMediaSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductMediaSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
index 89b9a344e7d12..0273b39f48aba 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductMediaSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductMediaSection">
         <element name="imageFile" type="text" selector="//*[@class='product media']//img[contains(@src, '{{filename}}')]" parameterized="true"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductMoreInformationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMoreInformationSection.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductMoreInformationSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMoreInformationSection.xml
index e6269631274eb..fc2102e073de3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductMoreInformationSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMoreInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductMoreInformationSection">
         <element name="moreInformation" type="button" selector="#tab-label-additional-title" timeout="30"/>
         <element name="moreInformationTextArea" type="textarea" selector="#additional"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductPageSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
index a3703839601fd..632ee2dea68eb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductPageSection">
         <element name="qtyInput" type="button" selector="input.input-text.qty"/>
         <element name="addToCartBtn" type="button" selector="button.action.tocart.primary"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddDefaultImageSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddDefaultImageSimpleProductTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
index 3b3693d0ff8a6..c9b6e033a2fd8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddDefaultImageSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultImageSimpleProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddDefaultImageVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddDefaultImageVirtualProductTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
index 292ba20f48bd3..add917199e2eb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddDefaultImageVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddRemoveProductImageVirtualProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageForCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageForCategoryTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml
index 04e34871c8b73..6ee72877a0da0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageForCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageForCategoryTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddImageForCategoryTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
index 43ce7e59ba621..479247ade8cb2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddImageToWYSIWYGCatalogTest">
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="login"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
index e0582fff6c3c7..d6e055c43322a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddImageToWYSIWYGProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAssignProductAttributeToAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAssignProductAttributeToAttributeSetTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
index 3615f4132ffb0..aed667db1f7b2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAssignProductAttributeToAttributeSetTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAssignProductAttributeToAttributeSetTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAssignProductAttributeToAttributeSetTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateCategoryFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateCategoryFromProductPageTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
index 7c81f4472e92a..d5483f772f028 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateCategoryFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateCategoryFromProductPageTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateCategoryTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
index 2c39be3317545..7e3e2cd918f5e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateCategoryTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductCustomAttributeSet.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductCustomAttributeSet.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml
index 65e987461b982..038c8fd2263f0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductCustomAttributeSet.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductCustomAttributeSet.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateProductCustomAttributeSet">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductDuplicateUrlkeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductDuplicateUrlkeyTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml
index 4e3f9da79b643..0340eea852a4c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductDuplicateUrlkeyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateProductDuplicateUrlkeyTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
index 791ed1fdf83ac..dbe5a90d592da 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateRootCategoryAndSubcategoriesTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml
index f5fb0e87bdc01..b2e6119ef4e13 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateSimpleProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductWithUnicodeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductWithUnicodeTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
index db127799c97e9..486fea9d91f9e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateSimpleProductWithUnicodeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateSimpleProductWithUnicodeTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminEditTextEditorProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminEditTextEditorProductAttributeTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
index d406b6c920dc0..71f2ffecb4652 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminEditTextEditorProductAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminEditTextEditorProductAttributeTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassChangeProductsStatusTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassChangeProductsStatusTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
index cf7c6af2fbd85..2edca19deeb00 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassChangeProductsStatusTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminMassChangeProductsStatusTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
index f0d50c8a5f7d6..7c3e31e90c015 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminMassUpdateProductAttributesGlobalScopeTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
index 96b8032f88751..be0bc2bf52a0b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminMassUpdateProductAttributesMissingRequiredFieldTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
index 00a2e41e2dfb3..f7a04709b76d9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminMassUpdateProductAttributesStoreViewScopeTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMoveAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMoveAnchoredCategoryTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml
index 024af2a77a5ef..d29fde8590c9d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMoveAnchoredCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryTest.xml
@@ -6,7 +6,7 @@
  */
 -->
 
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminMoveAnchoredCategoryTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
index 8bdfc678e4560..43caafe8790d3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminMultipleWebsitesUseDefaultValuesTest">
         <annotations>
             <title value="Use Default Value checkboxes should be checked for new website scope"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminProductGridFilteringByDateAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminProductGridFilteringByDateAttributeTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
index 43edc3a54e00b..b079d35296e43 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminProductGridFilteringByDateAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminProductGridFilteringByDateAttributeTest">
         <annotations>
             <title value="Verify Set Product as new Filter input on Product Grid doesn't getreset to currentDate"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
index 8b1f4fdc9380c..c8be44eb73ca9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminProductStatusAttributeDisabledByDefaultTest">
         <annotations>
             <title value="Verify the default option value for product Status attribute is set correctly during product creation"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveDefaultImageSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveDefaultImageSimpleProductTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
index 4623f2ad4a90c..f20e6caf637d4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveDefaultImageSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultImageSimpleProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveDefaultImageVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveDefaultImageVirtualProductTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
index e872d96b8fdff..86cc16e141e0a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveDefaultImageVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultImageVirtualProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveImageFromCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveImageFromCategoryTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml
index 11b29b9dd33e7..c68a848fb0fb6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminRemoveImageFromCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageFromCategoryTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminRemoveImageFromCategoryTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminSimpleProductImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml
similarity index 99%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminSimpleProductImagesTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml
index d0d5ba4a6f7ba..b51f6a6e43249 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminSimpleProductImagesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminSimpleProductImagesTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
index 7be5e5d281933..1441e2175d08e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminUnassignProductAttributeFromAttributeSetTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminUpdateCategoryStoreUrlKeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
index e29890befd860..013b1b6d38123 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminUpdateCategoryStoreUrlKeyTest">
         <annotations>
             <features value="SEO-friendly URL Key Update"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdvanceCatalogSearchSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdvanceCatalogSearchSimpleProductTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
index a302fa58ec241..03d919e329115 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdvanceCatalogSearchSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdvanceCatalogSearchSimpleProductByNameTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/ConfigurableOptionTextInputLengthValidationHint.xml b/app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/ConfigurableOptionTextInputLengthValidationHint.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml
index 45db40dd2e3dd..c97d2c45be951 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/ConfigurableOptionTextInputLengthValidationHint.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/ConfigurableOptionTextInputLengthValidationHint.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="ConfigurableOptionTextinputLengthValidationHintTest">
         <annotations>
             <features value="Product Customizable Option"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/DeleteCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/DeleteCategoriesTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
index 84035adaa90e6..4ec775f7ea2d8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/DeleteCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="DeleteCategoriesTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CAdminTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index 0f466ccc3d994..a9829b67189cb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CAdminTest">
         <annotations>
             <features value="End to End scenarios"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 54782ca8ca530..e80de8122e810 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CGuestUserTest">
         <annotations>
             <features value="End to End scenarios"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CLoggedInUserTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index 9bd00ea3aef32..b8827616e3ec5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CLoggedInUserTest">
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
index 49f0e9e362ce0..0166d15e226c0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="SaveProductWithCustomOptionsAdditionalWebsiteTest">
         <annotations>
             <features value="Save a product with Custom Options and assign to a different website"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SimpleProductTwoCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SimpleProductTwoCustomOptionsTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
index 2710002d625d7..e05a259eaf974 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SimpleProductTwoCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <test name="SimpleProductTwoCustomOptionsTest">
-        <annotations>
-            <features value="Catalog"/>
-            <stories value="Create simple product with two custom options" />
-            <title value="Admin should be able to create simple product with two custom options"/>
-            <description value="Admin should be able to create simple product with two custom options"/>
-            <severity value="AVERAGE"/>
-            <testCaseId value="MC-248"/>
-            <group value="Catalog"/>
-        </annotations>
-        <before>
-            <!-- log in as admin -->
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-
-            <!--Create product-->
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-            <waitForPageLoad stepKey="waitForProductIndexPage"/>
-            <actionGroup ref="goToCreateProductPage" stepKey="goToCreateSimpleProduct">
-                <argument name="product" value="SimpleProduct3"/>
-            </actionGroup>
-            <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillSimpleProductMain">
-                <argument name="product" value="SimpleProduct3"/>
-            </actionGroup>
-        </before>
-        <after>
-            <!-- Delete the created product -->
-            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-                <argument name="product" value="SimpleProduct3"/>
-            </actionGroup>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-        </after>
-
-        <!-- opens the custom option panel and clicks add options -->
-        <click stepKey="openCustomizableOptions" selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}"/>
-        <waitForPageLoad stepKey="waitForCustomOptionsOpen"/>
-
-        <!-- Create a custom option with 2 values -->
-        <actionGroup ref="CreateCustomRadioOptions" stepKey="createCustomOption1">
-            <argument name="customOptionName" value="ProductOptionRadiobutton.title"/>
-            <argument name="productOption" value="ProductOptionField"/>
-            <argument name="productOption2" value="ProductOptionField2"/>
-        </actionGroup>
-
-        <!-- Create another custom option with 2 values -->
-        <actionGroup ref="CreateCustomRadioOptions" stepKey="createCustomOption2">
-            <argument name="customOptionName" value="ProductOptionRadiobutton.title"/>
-            <argument name="productOption" value="ProductOptionField"/>
-            <argument name="productOption2" value="ProductOptionField2"/>
-        </actionGroup>
-
-        <!-- Save the product -->
-        <click stepKey="saveProduct" selector="{{AdminProductFormActionSection.saveButton}}"/>
-        <waitForPageLoad stepKey="waitForProductSaved"/>
-        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
-
-        <!-- navigate to the created product page -->
-        <amOnPage url="/{{SimpleProduct3.name}}.html" stepKey="goToCreatedProduct"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-
-        <!-- Check to make sure all of the created names are there -->
-        <see stepKey="assertNameInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField.title}}"/>
-        <see stepKey="assertNameInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField.title}}"/>
-        <see stepKey="assertSecondNameInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField2.title}}"/>
-        <see stepKey="assertSecondNameInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField2.title}}"/>
-
-        <!-- Check to see that all of the created prices are there -->
-        <see stepKey="assertPriceInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField.price}}"/>
-        <see stepKey="assertPriceInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField.price}}"/>
-        <see stepKey="assertSecondPriceInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField2.price}}"/>
-        <see stepKey="assertSecondPriceInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField2.price}}"/>
-
-        <!-- select two of the radio buttons -->
-        <click stepKey="selectFirstCustomOption" selector="{{StorefrontProductInfoMainSection.nthCustomOptionInput('1','2')}}"/>
-        <click stepKey="selectSecondCustomOption" selector="{{StorefrontProductInfoMainSection.nthCustomOptionInput('2','1')}}"/>
-
-        <!-- Check that the price has actually changed -->
-        <see stepKey="assertPriceHasChanged" selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="153.00"/>
-    </test>
-</tests>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="SimpleProductTwoCustomOptionsTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create simple product with two custom options" />
+            <title value="Admin should be able to create simple product with two custom options"/>
+            <description value="Admin should be able to create simple product with two custom options"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-248"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <!-- log in as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!--Create product-->
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <waitForPageLoad stepKey="waitForProductIndexPage"/>
+            <actionGroup ref="goToCreateProductPage" stepKey="goToCreateSimpleProduct">
+                <argument name="product" value="SimpleProduct3"/>
+            </actionGroup>
+            <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillSimpleProductMain">
+                <argument name="product" value="SimpleProduct3"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Delete the created product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="SimpleProduct3"/>
+            </actionGroup>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <!-- opens the custom option panel and clicks add options -->
+        <click stepKey="openCustomizableOptions" selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}"/>
+        <waitForPageLoad stepKey="waitForCustomOptionsOpen"/>
+
+        <!-- Create a custom option with 2 values -->
+        <actionGroup ref="CreateCustomRadioOptions" stepKey="createCustomOption1">
+            <argument name="customOptionName" value="ProductOptionRadiobutton.title"/>
+            <argument name="productOption" value="ProductOptionField"/>
+            <argument name="productOption2" value="ProductOptionField2"/>
+        </actionGroup>
+
+        <!-- Create another custom option with 2 values -->
+        <actionGroup ref="CreateCustomRadioOptions" stepKey="createCustomOption2">
+            <argument name="customOptionName" value="ProductOptionRadiobutton.title"/>
+            <argument name="productOption" value="ProductOptionField"/>
+            <argument name="productOption2" value="ProductOptionField2"/>
+        </actionGroup>
+
+        <!-- Save the product -->
+        <click stepKey="saveProduct" selector="{{AdminProductFormActionSection.saveButton}}"/>
+        <waitForPageLoad stepKey="waitForProductSaved"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
+
+        <!-- navigate to the created product page -->
+        <amOnPage url="/{{SimpleProduct3.name}}.html" stepKey="goToCreatedProduct"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- Check to make sure all of the created names are there -->
+        <see stepKey="assertNameInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField.title}}"/>
+        <see stepKey="assertNameInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField.title}}"/>
+        <see stepKey="assertSecondNameInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField2.title}}"/>
+        <see stepKey="assertSecondNameInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField2.title}}"/>
+
+        <!-- Check to see that all of the created prices are there -->
+        <see stepKey="assertPriceInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField.price}}"/>
+        <see stepKey="assertPriceInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField.price}}"/>
+        <see stepKey="assertSecondPriceInFirstOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('1')}}" userInput="{{ProductOptionField2.price}}"/>
+        <see stepKey="assertSecondPriceInSecondOption" selector="{{StorefrontProductInfoMainSection.nthCustomOption('2')}}" userInput="{{ProductOptionField2.price}}"/>
+
+        <!-- select two of the radio buttons -->
+        <click stepKey="selectFirstCustomOption" selector="{{StorefrontProductInfoMainSection.nthCustomOptionInput('1','2')}}"/>
+        <click stepKey="selectSecondCustomOption" selector="{{StorefrontProductInfoMainSection.nthCustomOptionInput('2','1')}}"/>
+
+        <!-- Check that the price has actually changed -->
+        <see stepKey="assertPriceHasChanged" selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="153.00"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductNameWithDoubleQuote.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductNameWithDoubleQuote.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
index a848515aee873..956677c8b5de5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductNameWithDoubleQuote.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontProductNameWithDoubleQuote">
         <annotations>
             <title value="Product with double quote in name"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductWithEmptyAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductWithEmptyAttributeTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml
index f858340bc09fa..92013f6f9d0f0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductWithEmptyAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithEmptyAttributeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontProductWithEmptyAttributeTest">
         <annotations>
             <title value="Product attribute is not visible on storefront if it is empty"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
index 38872c4c58dcf..c03241348e807 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductsCompareWithEmptyAttributeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontProductsCompareWithEmptyAttributeTest">
         <annotations>
             <title value="Product attribute is not visible on product compare page if it is empty"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml
index 93585f8c14985..a8bb56633cfb9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViews.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontPurchaseProductWithCustomOptions.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontPurchaseProductWithCustomOptions.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
index fa81e15833b81..3a7feb34354d7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontPurchaseProductWithCustomOptions.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontPurchaseProductWithCustomOptions">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml
index 53c0ba041c77f..51290ba12f2c7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyChildCategoriesShouldNotIncludeInMenuTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="VerifyChildCategoriesShouldNotIncludeInMenuTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
index b0146f1c8deef..234148830bd43 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="VerifyDefaultWYSIWYGToolbarOnProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
index f7ff2f047ea5f..5fc0b6478ffb8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
index 7e78b476ae7dc..e2077f8676706 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/composer.json b/app/code/Magento/Catalog/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..501fc0fa6c8db
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/composer.json
@@ -0,0 +1,44 @@
+{
+    "name": "magento/functional-test-module-catalog",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-catalog-rule": "100.0.0-dev",
+        "magento/functional-test-module-catalog-url-rewrite": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-cms": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-indexer": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-msrp": "100.0.0-dev",
+        "magento/functional-test-module-page-cache": "100.0.0-dev",
+        "magento/functional-test-module-product-alert": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-url-rewrite": "100.0.0-dev",
+        "magento/functional-test-module-widget": "100.0.0-dev",
+        "magento/functional-test-module-wishlist": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-cookie": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-catalog-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/LICENSE.txt b/app/code/Magento/CatalogAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/LICENSE.txt
rename to app/code/Magento/CatalogAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/LICENSE_AFL.txt b/app/code/Magento/CatalogAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/CatalogAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogAnalytics/Test/Mftf/README.md b/app/code/Magento/CatalogAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..1d9f8f781e4b9
--- /dev/null
+++ b/app/code/Magento/CatalogAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Analytics Functional Tests
+
+The Functional Test Module for **Magento Catalog Analytics** module.
diff --git a/app/code/Magento/CatalogAnalytics/Test/Mftf/composer.json b/app/code/Magento/CatalogAnalytics/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..c03b128d9ad83
--- /dev/null
+++ b/app/code/Magento/CatalogAnalytics/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-catalog-analytics",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/CatalogGraphQl/Test/Mftf/README.md b/app/code/Magento/CatalogGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..81b6b9cf9beec
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Catalog Graph Ql** module.
diff --git a/app/code/Magento/CatalogGraphQl/Test/Mftf/composer.json b/app/code/Magento/CatalogGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..81a291e1527fc
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/functional-test-module-catalog-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-search": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-eav-graph-ql": "100.0.0-dev",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-graph-ql": "100.0.0-dev",
+        "magento/functional-test-module-store-graph-ql": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/LICENSE.txt b/app/code/Magento/CatalogImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/LICENSE.txt
rename to app/code/Magento/CatalogImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/LICENSE_AFL.txt b/app/code/Magento/CatalogImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/LICENSE_AFL.txt
rename to app/code/Magento/CatalogImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/README.md b/app/code/Magento/CatalogImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..bdf321bbcd4bd
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Import Export Functional Tests
+
+The Functional Test Module for **Magento Catalog Import Export** module.
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/composer.json b/app/code/Magento/CatalogImportExport/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..1f223fc5f46b5
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/functional-test-module-catalog-import-export",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-catalog-url-rewrite": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-import-export": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/ActionGroup/DisplayOutOfStockProductActionGroup.xml b/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/DisplayOutOfStockProductActionGroup.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/ActionGroup/DisplayOutOfStockProductActionGroup.xml
rename to app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/DisplayOutOfStockProductActionGroup.xml
index b75cbff116761..1bec4cc99c0e8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/ActionGroup/DisplayOutOfStockProductActionGroup.xml
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/DisplayOutOfStockProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="displayOutOfStockProduct">
         <amOnPage url="{{InventoryConfigurationPage.url}}" stepKey="navigateToInventoryConfigurationPage"/>
         <waitForPageLoad stepKey="waitForConfigPageToLoad"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/LICENSE.txt b/app/code/Magento/CatalogInventory/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/LICENSE.txt
rename to app/code/Magento/CatalogInventory/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/LICENSE_AFL.txt b/app/code/Magento/CatalogInventory/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/LICENSE_AFL.txt
rename to app/code/Magento/CatalogInventory/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/Page/InventoryConfigurationPage.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Page/InventoryConfigurationPage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/Page/InventoryConfigurationPage.xml
rename to app/code/Magento/CatalogInventory/Test/Mftf/Page/InventoryConfigurationPage.xml
index d138aadb144d8..95e873a3b164d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/Page/InventoryConfigurationPage.xml
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Page/InventoryConfigurationPage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="InventoryConfigurationPage" url="admin/system_config/edit/section/cataloginventory/" area="admin" module="Magento_Config">
         <section name="InventorySection"/>
     </page>
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/README.md b/app/code/Magento/CatalogInventory/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3903fe316b36c
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Inventory Functional Tests
+
+The Functional Test Module for **Magento Catalog Inventory** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/Section/InventorySection.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Section/InventorySection.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/Section/InventorySection.xml
rename to app/code/Magento/CatalogInventory/Test/Mftf/Section/InventorySection.xml
index 526d8b5730eb0..55fbc84ead96a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/Section/InventorySection.xml
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Section/InventorySection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="InventoryConfigSection">
         <element name="ProductStockOptionsTab" type="button" selector="#cataloginventory_options-head"/>
         <element name="CheckIfProductStockOptionsTabExpanded" type="button" selector="#cataloginventory_options-head:not(.open)"/>
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/composer.json b/app/code/Magento/CatalogInventory/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..afd8d3ddb661a
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "magento/functional-test-module-catalog-inventory",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/Data/CatalogRuleData.xml b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/Data/CatalogRuleData.xml
rename to app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
index bf750bc3c9944..2b11a4db0578d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/Data/CatalogRuleData.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultCatalogRule" type="catalogRule">
         <data key="name" unique="suffix">CatalogPriceRule</data>
         <data key="description">Catalog Price Rule Description</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/LICENSE.txt b/app/code/Magento/CatalogRule/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/LICENSE.txt
rename to app/code/Magento/CatalogRule/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/LICENSE_AFL.txt b/app/code/Magento/CatalogRule/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/LICENSE_AFL.txt
rename to app/code/Magento/CatalogRule/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/Metadata/catalog-rule-meta.xml b/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/Metadata/catalog-rule-meta.xml
rename to app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml
index e404e4471ba45..6f5bd2decc6ce 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/Metadata/catalog-rule-meta.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml
@@ -8,7 +8,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="createCatalogRule" dataType="catalogRule"
                type="create" auth="adminFormKey" url="/catalog_rule/promo_catalog/save/" method="POST">
         <contentType>application/x-www-form-urlencoded</contentType>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/README.md b/app/code/Magento/CatalogRule/Test/Mftf/README.md
new file mode 100644
index 0000000000000..086f52535e00a
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Rule Functional Tests
+
+The Functional Test Module for **Magento Catalog Rule** module.
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/composer.json b/app/code/Magento/CatalogRule/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..0b57cf8dfaefa
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "magento/functional-test-module-catalog-rule",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-rule": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-import-export": "100.0.0-dev",
+        "magento/functional-test-module-catalog-rule-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/LICENSE.txt b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/LICENSE.txt
rename to app/code/Magento/CatalogRuleConfigurable/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/LICENSE_AFL.txt b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/LICENSE_AFL.txt
rename to app/code/Magento/CatalogRuleConfigurable/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/README.md b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3d271b8325e60
--- /dev/null
+++ b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Rule Configurable Functional Tests
+
+The Functional Test Module for **Magento Catalog Rule Configurable** module.
diff --git a/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/composer.json b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..20b1a74c9416a
--- /dev/null
+++ b/app/code/Magento/CatalogRuleConfigurable/Test/Mftf/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "magento/functional-test-module-catalog-rule-configurable",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/magento-composer-installer": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-rule": "100.0.0-dev",
+        "magento/functional-test-module-configurable-product": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-catalog-rule": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/ActionGroup/StorefrontCatalogSearchActionGroup.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index fdf0564780024..c4bb5ff4b6dc7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Quick search the phrase and check if the result page contains correct information -->
     <actionGroup name="StorefrontCheckQuickSearchActionGroup">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Data/ConstData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConstData.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Data/ConstData.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Data/ConstData.xml
index fd28b0ddc5c6c..08fc1ce00e5e4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Data/ConstData.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConstData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
     <entity name="CONST" type="CONST">
         <data key="apiSimpleProduct">Api Simple Product</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/LICENSE.txt b/app/code/Magento/CatalogSearch/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/LICENSE.txt
rename to app/code/Magento/CatalogSearch/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/LICENSE_AFL.txt b/app/code/Magento/CatalogSearch/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/LICENSE_AFL.txt
rename to app/code/Magento/CatalogSearch/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedFormPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedFormPage.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedFormPage.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedFormPage.xml
index 0fa4333ca2088..c52d816f0f30a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedFormPage.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedFormPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontCatalogSearchAdvancedFormPage" url="/catalogsearch/advanced/" area="storefront" module="Magento_CatalogSearch">
         <section name="StorefrontCatalogSearchAdvancedFormSection" />
         <section name="StorefrontQuickSearchSection" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedResultPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedResultPage.xml
similarity index 72%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedResultPage.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedResultPage.xml
index 4afdbea5f9263..422ccc652b793 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchAdvancedResultPage.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchAdvancedResultPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontCatalogSearchAdvancedResultPage" url="/catalogsearch/advanced/result" area="storefront" module="Magento_CatalogSearch">
         <section name="StorefrontCatalogSearchAdvancedResultMainSection" />
         <section name="StorefrontQuickSearchSection" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchPage.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchPage.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchPage.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchPage.xml
index bbca39348ba26..6141aa96226c0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Page/StorefrontCatalogSearchPage.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Page/StorefrontCatalogSearchPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontCatalogSearchPage" url="/catalogsearch/result/" area="storefront" module="Magento_CatalogSearch">
         <section name="StorefrontCatalogSearchMainSection" />
         <section name="StorefrontQuickSearchSection" />
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/README.md b/app/code/Magento/CatalogSearch/Test/Mftf/README.md
new file mode 100644
index 0000000000000..5ee0e968a4d3a
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Search Functional Tests
+
+The Functional Test Module for **Magento Catalog Search** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedFormSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedFormSection.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
index 30cb16d684be6..d7c63ca1af2de 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedFormSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedFormSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCatalogSearchAdvancedFormSection">
         <element name="SearchTitle" type="text" selector=".page-title span"/>
         <element name="ProductName" type="input" selector="#name"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
similarity index 82%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
index bf143d5f4b8b5..d0634754eeed8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCatalogSearchAdvancedResultMainSection">
         <element name="SearchTitle" type="text" selector=".page-title span"/>
         <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchMainSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchMainSection.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
index 440cd4fe8da0b..165629f1cea81 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontCatalogSearchMainSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCatalogSearchMainSection">
         <element name="SearchTitle" type="text" selector=".page-title span"/>
         <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontFooterSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontFooterSection.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontFooterSection.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontFooterSection.xml
index 97f4c35537099..dae21aeefc1f9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Section/StorefrontFooterSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontFooterSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontFooterSection">
         <element name="AdvancedSearch" type="button" selector="//footer//ul//li//a[text()='Advanced Search']"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchSimpleProductTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchSimpleProductTest.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
index 11bc308902ca0..f33f3db14b6cc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/AdvanceCatalogSearchSimpleProductTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdvanceCatalogSearchSimpleProductByNameTest">
         <annotations>
             <features value="CatalogSearch"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CGuestUserTest.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index a5b7e520a76e4..b19c00eaf325b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CGuestUserTest">
         <!-- Step 2: User searches for product -->
         <comment userInput="Start of searching products" stepKey="startOfSearchingProducts" after="endOfBrowsingCatalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
rename to app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index cb84e46ebf54c..5669a788105fa 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CLoggedInUserTest">
         <!-- Step 2: User searches for product -->
         <comment userInput="Start of searching products" stepKey="startOfSearchingProducts" after="endOfBrowsingCatalog"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/composer.json b/app/code/Magento/CatalogSearch/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..7d54620eeac83
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/functional-test-module-catalog-search",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-search": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/LICENSE.txt b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/LICENSE.txt
rename to app/code/Magento/CatalogUrlRewrite/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/LICENSE_AFL.txt b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/LICENSE_AFL.txt
rename to app/code/Magento/CatalogUrlRewrite/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/README.md b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/README.md
new file mode 100644
index 0000000000000..785d0cce48c3e
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Url Rewrite Functional Tests
+
+The Functional Test Module for **Magento Catalog Url Rewrite** module.
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/composer.json b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..03c48982f5865
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/functional-test-module-catalog-url-rewrite",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-import-export": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-import-export": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-url-rewrite": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/Test/Mftf/README.md b/app/code/Magento/CatalogUrlRewriteGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..331e823743b19
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Url Rewrite Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Catalog Url Rewrite Graph Ql** module.
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/Test/Mftf/composer.json b/app/code/Magento/CatalogUrlRewriteGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..a66ca925561c1
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-catalog-url-rewrite-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-catalog-url-rewrite": "100.0.0-dev",
+        "magento/functional-test-module-catalog-graph-ql": "100.0.0-dev",
+        "magento/functional-test-module-url-rewrite-graph-ql": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/LICENSE.txt b/app/code/Magento/CatalogWidget/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/LICENSE.txt
rename to app/code/Magento/CatalogWidget/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/LICENSE_AFL.txt b/app/code/Magento/CatalogWidget/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/LICENSE_AFL.txt
rename to app/code/Magento/CatalogWidget/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/README.md b/app/code/Magento/CatalogWidget/Test/Mftf/README.md
new file mode 100644
index 0000000000000..2ba00559524cb
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Catalog Widget Functional Tests
+
+The Functional Test Module for **Magento Catalog Widget** module.
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/composer.json b/app/code/Magento/CatalogWidget/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..9b3437526718a
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/functional-test-module-catalog-widget",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-rule": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-widget": "100.0.0-dev",
+        "magento/functional-test-module-wishlist": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/CheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/CheckoutActionGroup.xml
rename to app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
index 551ebeb1d0e00..e70bccbfdfe2b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/CheckoutActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Go to checkout from minicart -->
     <actionGroup name="GoToCheckoutFromMinicartActionGroup">
         <wait stepKey="wait" time="10" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
rename to app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
index 98b3e439382b7..e7a6e219d28b1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Guest checkout filling billing section -->
     <actionGroup name="GuestCheckoutFillNewBillingAddressActionGroup">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontMiniCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontMiniCartActionGroup.xml
rename to app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
index 9e7c0e082036f..b2402d94723cd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontMiniCartActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="clickViewAndEditCartFromMiniCart">
         <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart"/>
         <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontProductCartActionGroup.xml
rename to app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index b98e1046c4a5b..35ddfdaefe050 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Add Product to Cart from the category page and check message and product count in Minicart -->
     <actionGroup name="StorefrontAddCategoryProductToCartActionGroup">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/ConstData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/ConstData.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/ConstData.xml
rename to app/code/Magento/Checkout/Test/Mftf/Data/ConstData.xml
index 10bc4fd90e7f9..1703d7255e1f8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/ConstData.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/ConstData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
     <entity name="CONST" type="CONST">
         <data key="successGuestCheckoutOrderNumberMessage">Your order # is:</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/QuoteData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
similarity index 72%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/QuoteData.xml
rename to app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
index d3c7507390973..51fb264a16a1c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Data/QuoteData.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/QuoteData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
     <entity name="E2EB2CQuote" type="Quote">
         <data key="subtotal">480.00</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/LICENSE.txt b/app/code/Magento/Checkout/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/LICENSE.txt
rename to app/code/Magento/Checkout/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/LICENSE_AFL.txt b/app/code/Magento/Checkout/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/LICENSE_AFL.txt
rename to app/code/Magento/Checkout/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml
rename to app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
index 30e9bb0c95796..dcc652829b3cc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutCartPage.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="CheckoutCartPage" url="/checkout/cart" module="Checkout" area="storefront">
         <section name="CheckoutCartProductSection"/>
         <section name="CheckoutCartSummarySection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml
rename to app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
index a0efb0668fe1d..aa11d42275a38 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="CheckoutPage" url="/checkout" area="storefront" module="Magento_Checkout">
         <section name="CheckoutShippingSection"/>
         <section name="CheckoutShippingMethodsSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutSuccessPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutSuccessPage.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutSuccessPage.xml
rename to app/code/Magento/Checkout/Test/Mftf/Page/CheckoutSuccessPage.xml
index 891e7fff96a3c..1c3293267e2ab 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutSuccessPage.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutSuccessPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="CheckoutSuccessPage" url="/checkout/onepage/success/" area="storefront" module="Magento_Checkout">
         <section name="CheckoutSuccessMainSection"/>
         <section name="CheckoutSuccessRegisterSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/GuestCheckoutReviewAndPaymentsPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/GuestCheckoutReviewAndPaymentsPage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/GuestCheckoutReviewAndPaymentsPage.xml
rename to app/code/Magento/Checkout/Test/Mftf/Page/GuestCheckoutReviewAndPaymentsPage.xml
index 3fb6e99ed6730..cac9c934cd662 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/GuestCheckoutReviewAndPaymentsPage.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/GuestCheckoutReviewAndPaymentsPage.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="GuestCheckoutReviewAndPaymentsPage" url="/checkout/#payment" area="storefront" module="Magento_Checkout">
         <section name="CheckoutPaymentSection"/>
     </page>
diff --git a/app/code/Magento/Checkout/Test/Mftf/README.md b/app/code/Magento/Checkout/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ec43eb9c6c3ef
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Checkout Functional Tests
+
+The Functional Test Module for **Magento Checkout** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index fa0776c1f60c9..6e2262d58b89d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutCartProductSection">
         <element name="ProductLinkByName" type="button"
                  selector="//main//table[@id='shopping-cart-table']//tbody//tr//strong[contains(@class, 'product-item-name')]//a[contains(text(), '{{var1}}')]"
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
index 248070940542c..ce4069a0c916d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutCartSummarySection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutCartSummarySection">
         <element name="subtotal" type="text" selector="//*[@id='cart-totals']//tr[@class='totals sub']//td//span[@class='price']"/>
         <element name="shippingMethod" type="text" selector="//*[@id='cart-totals']//tr[@class='totals shipping excl']//th//span[@class='value']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutHeaderSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutHeaderSection.xml
similarity index 72%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutHeaderSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/CheckoutHeaderSection.xml
index 29685f2ed54ac..ca42eff89cf26 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutHeaderSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutHeaderSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutHeaderSection">
         <element name="shippingMethodStep" type="text" selector=".opc-progress-bar-item:nth-of-type(1)"/>
         <element name="reviewAndPaymentsStep" type="text" selector=".opc-progress-bar-item:nth-of-type(2)"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml
index 44bd86065b808..cb079d2f0361e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutOrderSummarySection">
         <element name="miniCartTab" type="button" selector=".title[role='tab']"/>
         <element name="productItemName" type="text" selector=".product-item-name"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
index 064e7bbdd9122..6d7533be7e9ea 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutPaymentSection">
         <element name="isPaymentSection" type="text" selector="//*[@class='opc-progress-bar']/li[contains(@class, '_active') and span[contains(.,'Review &amp; Payments')]]"/>
         <element name="availablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div:nth-child(2)>div.payment-method-title.field.choice"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingGuestInfoSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingGuestInfoSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
index f2cca89be6c18..ca13af52c1ed5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingGuestInfoSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutShippingGuestInfoSection">
         <element name="email" type="input" selector="#customer-email"/>
         <element name="firstName" type="input" selector="input[name=firstname]"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
index 2a59d2bdc8d9b..552341a531106 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutShippingMethodsSection">
         <element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
         <element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
index 247c9664caf0a..c20309814d51d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutShippingSection">
         <element name="isShippingStep" type="text" selector="//*[@class='opc-progress-bar']/li[contains(@class, '_active') and span[contains(.,'Shipping')]]"/>
         <element name="shippingTab" type="text" selector="//li[contains(@class,'opc-progress-bar-item')]//*[text()='Shipping']" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
index 2a1d84d7ccb1f..8a55015f9d244 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutSuccessMainSection">
         <element name="successTitle" type="text" selector=".page-title"/>
         <element name="success" type="text" selector="div.checkout-success"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
index 6a7690083ae92..271ccec450510 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessRegisterSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutSuccessRegisterSection">
         <element name="registerMessage" type="text" selector="#registration p:nth-child(1)"/>
         <element name="customerEmail" type="text" selector="#registration p:nth-child(2)"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StoreFrontRemoveItemModalSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontRemoveItemModalSection.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StoreFrontRemoveItemModalSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontRemoveItemModalSection.xml
index e6d994fb587b0..4e2a08e94bd9f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StoreFrontRemoveItemModalSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontRemoveItemModalSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StoreFrontRemoveItemModalSection">
         <element name="message" type="text" selector="aside.confirm div.modal-content"/>
         <element name="ok" type="button" selector="aside.confirm .modal-footer .action-primary"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontCategoryProductSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index a23caf141fc07..0edbb21bc6f5d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryProductSection">
         <element name="ProductAddToCartByNumber" type="button" selector="//main//li[{{var1}}]//button[contains(@class, 'tocart')]" parameterized="true"/>
         <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[contains(@class, 'tocart')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMessagesSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMessagesSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml
index d6f260ecaaac3..4341d99c3fb30 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMessagesSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontMessagesSection">
         <!-- @TODO: Use general message selector after MQE-694 is fixed -->
         <element name="messageProductAddedToCart" type="text"
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
index bdd97130a9715..0fa5dc8a42341 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontMiniCartSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontMinicartSection">
         <element name="productCount" type="text" selector="//header//div[contains(@class, 'minicart-wrapper')]//a[contains(@class, 'showcart')]//span[@class='counter-number']"/>
         <element name="viewAndEditCart" type="button" selector="//header//div[contains(@class, 'minicart-wrapper')]//a[contains(@class, 'viewcart')]"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontProductCompareMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
similarity index 72%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontProductCompareMainSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
index ba706aca8fe4a..823260be42f2a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontProductCompareMainSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductCompareMainSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductCompareMainSection">
         <element name="ProductAddToCartByName" type="button" selector="//*[@id='product-comparison']//td[.//strong[@class='product-item-name']/a[contains(text(), '{{var1}}')]]//button[contains(@class, 'tocart')]" parameterized="true"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontProductInfoMainSection.xml
rename to app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 798bbdf115d66..1ff5d2c874459 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoMainSection">
         <element name="AddToCart" type="button" selector="#product-addtocart-button"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
rename to app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
index 9564e4626976a..d718222283586 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="CheckCheckoutSuccessPageAsRegisterCustomer">
         <annotations>
             <features value="Checkout"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
similarity index 99%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CGuestUserTest.xml
rename to app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 1a056983ef3cb..e386698092aa4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CGuestUserTest">
         <!-- Step 3: User adds products to cart -->
         <comment userInput="Start of adding products to cart" stepKey="startOfAddingProductsToCart" after="endOfBrowsingCatalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
similarity index 99%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CLoggedInUserTest.xml
rename to app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index 8d7bbdeff7fb4..6effeec685106 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CLoggedInUserTest">
         <!-- Step 3: User adds products to cart -->
         <comment userInput="Start of adding products to cart" stepKey="startOfAddingProductsToCart" after="endOfBrowsingCatalog"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
rename to app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
index ac29f8aa0bcc9..efa8b4ca75147 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="NoErrorCartCheckoutForProductsDeletedFromMiniCartTest">
         <annotations>
             <features value="Checkout"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontCustomerCheckoutTest.xml
rename to app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
index 13d60edbd87b2..c88f6cec4bcdb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontCustomerCheckoutTest">
         <annotations>
             <features value="Checkout"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontGuestCheckoutTest.xml
rename to app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
index 02ce7ae57cf3e..9d88e42447cb6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontGuestCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontGuestCheckoutTest">
         <annotations>
             <features value="Checkout"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/composer.json b/app/code/Magento/Checkout/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..32c1a2c6bcd3f
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "magento/functional-test-module-checkout",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-msrp": "100.0.0-dev",
+        "magento/functional-test-module-page-cache": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-sales-rule": "100.0.0-dev",
+        "magento/functional-test-module-shipping": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-cookie": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/LICENSE.txt b/app/code/Magento/CheckoutAgreements/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/LICENSE.txt
rename to app/code/Magento/CheckoutAgreements/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/LICENSE_AFL.txt b/app/code/Magento/CheckoutAgreements/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/LICENSE_AFL.txt
rename to app/code/Magento/CheckoutAgreements/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CheckoutAgreements/Test/Mftf/README.md b/app/code/Magento/CheckoutAgreements/Test/Mftf/README.md
new file mode 100644
index 0000000000000..593e89f08b5b5
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Checkout Agreements Functional Tests
+
+The Functional Test Module for **Magento Checkout Agreements** module.
diff --git a/app/code/Magento/CheckoutAgreements/Test/Mftf/composer.json b/app/code/Magento/CheckoutAgreements/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..5ba702a5903a5
--- /dev/null
+++ b/app/code/Magento/CheckoutAgreements/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-checkout-agreements",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/AssertCMSBlockContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSBlockContentActionGroup.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/AssertCMSBlockContentActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSBlockContentActionGroup.xml
index c45e0036e719a..553d851707b96 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/AssertCMSBlockContentActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSBlockContentActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertBlockContent">
         <grabValueFrom selector="{{BlockNewPageBasicFieldsSection.blockTitle}}"  stepKey="grabTextFromTitle"/>
         <assertEquals stepKey="assertTitle" message="pass">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/AssertCMSPageContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageContentActionGroup.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/AssertCMSPageContentActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageContentActionGroup.xml
index 10a51aadd09b5..f286c9159c6d8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/AssertCMSPageContentActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageContentActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertCMSPageContent">
         <grabValueFrom selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}"  stepKey="grabTextFromTitle"/>
         <assertEquals stepKey="assertTitle" message="pass">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/AssignBlockToCMSPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssignBlockToCMSPageActionGroup.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/AssignBlockToCMSPageActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/AssignBlockToCMSPageActionGroup.xml
index d5efbe4b258ea..3fa72c2d6b561 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/AssignBlockToCMSPageActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssignBlockToCMSPageActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssignBlockToCMSPage">
         <arguments>
             <argument name="Block" defaultValue=""/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CMSActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index 0639837a50f13..06419356d8e84 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="navigateToCreatedCMSPage">
         <arguments>
             <argument name="CMSPage" defaultValue=""/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/DeleteImageFromStorageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/DeleteImageFromStorageActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml
index c4853d9f824c0..cbd239cde80fe 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/DeleteImageFromStorageActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeleteImageFromStorageActionGroup">
         <arguments>
             <argument name="Image"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/FillOutBlockContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutBlockContentActionGroup.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/FillOutBlockContentActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutBlockContentActionGroup.xml
index c593103f95676..ef7c925c3f8f7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/FillOutBlockContentActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutBlockContentActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="FillOutBlockContent">
         <fillField selector="{{BlockNewPageBasicFieldsSection.blockTitle}}" userInput="{{_defaultBlock.title}}" stepKey="fillFieldTitle1"/>
         <fillField selector="{{BlockNewPageBasicFieldsSection.identifier}}" userInput="{{_defaultBlock.identifier}}" stepKey="fillFieldIdentifier"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/FillOutCMSPageContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutCMSPageContentActionGroup.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/FillOutCMSPageContentActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutCMSPageContentActionGroup.xml
index bbda1f49f0187..5caeadcea282d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/FillOutCMSPageContentActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutCMSPageContentActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="FillOutCMSPageContent">
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_duplicatedCMSPage.title}}" stepKey="fillFieldTitle"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContentTabForPage"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/NavigateToMediaFolderActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/NavigateToMediaFolderActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml
index 4d5373eea3fb8..031481d90d1bd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/NavigateToMediaFolderActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="NavigateToMediaFolderActionGroup">
         <arguments>
             <argument name="FolderName" type="string"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/RestoreLayoutSettingActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/RestoreLayoutSettingActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
index 2e2acb8ac316f..54c4164749152 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/RestoreLayoutSettingActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="RestoreLayoutSetting">
         <waitForElementVisible selector="{{DefaultLayoutsSection.pageLayout}}" stepKey="waittForDefaultCMSLayout" after="expandDefaultLayouts" />
         <selectOption selector="{{DefaultLayoutsSection.pageLayout}}" userInput="1 column" stepKey="selectOneColumn" before="clickSaveConfig"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SearchBlockOnGridPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SearchBlockOnGridPageActionGroup.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SearchBlockOnGridPageActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/SearchBlockOnGridPageActionGroup.xml
index cee15a652d9f2..8656f4e03a21e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SearchBlockOnGridPageActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SearchBlockOnGridPageActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="searchBlockOnGridPage">
         <arguments>
             <argument name="Block" defaultValue=""/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SelectImageFromMediaStorageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
index 8f9b7595665f3..8c1d17c8d9bed 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="clickBrowseBtnOnUploadPopup">
         <click selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowse" />
         <waitForPageLoad stepKey="waitForPageLoad1" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/VerifyTinyMCEActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/VerifyTinyMCEActionGroup.xml
rename to app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml
index e3da3da1f2d4d..24900ad33b560 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/VerifyTinyMCEActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="VerifyTinyMCEActionGroup">
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" time="30" />
         <seeElement selector="{{TinyMCESection.TinyMCE4}}" stepKey="seeTinyMCE4" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/BlockPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/BlockPageData.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/BlockPageData.xml
rename to app/code/Magento/Cms/Test/Mftf/Data/BlockPageData.xml
index 89feb54a69f76..9e0db2ada4a2f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/BlockPageData.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Data/BlockPageData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultBlock" type="block">
         <data key="title">Default Block</data>
         <data key="identifier" unique="suffix" >block</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml
rename to app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
index 25e55ea756afb..73e2d6256ce61 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultCmsPage" type="cms_page">
         <data key="title">Test CMS Page</data>
         <data key="content_heading">Test Content Heading</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/LICENSE.txt b/app/code/Magento/Cms/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/LICENSE.txt
rename to app/code/Magento/Cms/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/LICENSE_AFL.txt b/app/code/Magento/Cms/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/LICENSE_AFL.txt
rename to app/code/Magento/Cms/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/block-meta.xml b/app/code/Magento/Cms/Test/Mftf/Metadata/block-meta.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/block-meta.xml
rename to app/code/Magento/Cms/Test/Mftf/Metadata/block-meta.xml
index 2cbae2b71a6ef..d764275f7c44b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/block-meta.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Metadata/block-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateBlock" dataType="block" type="create" auth="adminOauth" url="/V1/cmsBlock" method="POST">
         <contentType>application/json</contentType>
         <object key="block" dataType="block">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/cms-meta.xml b/app/code/Magento/Cms/Test/Mftf/Metadata/cms-meta.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/cms-meta.xml
rename to app/code/Magento/Cms/Test/Mftf/Metadata/cms-meta.xml
index 21ad5bc8d8752..495ca2ee0c2fe 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Metadata/cms-meta.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Metadata/cms-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateCMSPage" dataType="cms_page" type="create" auth="adminOauth" url="/V1/cmsPage" method="POST">
         <contentType>application/json</contentType>
         <object key="page" dataType="cms_page">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsBlocksPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsBlocksPage.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsBlocksPage.xml
rename to app/code/Magento/Cms/Test/Mftf/Page/CmsBlocksPage.xml
index e2db4ced8c4d0..790c2feafcad0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsBlocksPage.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsBlocksPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="CmsBlocksPage" url="/cms/block/" area="admin" module="Magento_Cms">
         <section name="BlockPageActionsSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewBlockPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewBlockPage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewBlockPage.xml
rename to app/code/Magento/Cms/Test/Mftf/Page/CmsNewBlockPage.xml
index 5cccbf2943114..d607c1ccf39af 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewBlockPage.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewBlockPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="CmsNewBlock" area="admin" url="/cms/block/new" module="Magento_Cms">
         <section name="CmsNewBlockBlockActionsSection"/>
         <section name="CmsNewBlockBlockBasicFieldsSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewPagePage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewPagePage.xml
rename to app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml
index 846f00f48a73f..b165d6c044c2b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewPagePage.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsNewPagePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="CmsNewPagePage" url="/cms/page/new" area="admin" module="Magento_Cms">
         <section name="CmsNewPagePageActionsSection"/>
         <section name="CmsNewPagePageBasicFieldsSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsPagesPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/CmsPagesPage.xml
similarity index 64%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsPagesPage.xml
rename to app/code/Magento/Cms/Test/Mftf/Page/CmsPagesPage.xml
index 1605a98d23a01..9dcb3d608d04e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsPagesPage.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Page/CmsPagesPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="CmsPagesPage" url="/cms/page" area="admin" module="Magento_Cms">
         <section name="CmsPagesPageActionsSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/StorefrontHomePage.xml b/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/StorefrontHomePage.xml
rename to app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml
index a6cdd6d333984..289d872aad804 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/StorefrontHomePage.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontHomePage" url="/" module="Magento_Cms" area="storefront">
         <section name="StorefrontHeaderSection"/>
     </page>
diff --git a/app/code/Magento/Cms/Test/Mftf/README.md b/app/code/Magento/Cms/Test/Mftf/README.md
new file mode 100644
index 0000000000000..5e223390c07cd
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cms Functional Tests
+
+The Functional Test Module for **Magento Cms** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockPageActionsSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
index e5609f55daec7..3fb56e0b179dd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="BlockPageActionsSection">
         <element name="addNewBlock" type="button" selector="#add" timeout="30"/>
         <element name="select" type="button" selector="//div[text()='{{var1}}']//parent::td//following-sibling::td//button[text()='Select']" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewBlockBlockActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewBlockBlockActionsSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
index 9918be3846263..65ea1226772cf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewBlockBlockActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsNewBlockBlockActionsSection">
         <element name="savePage" type="button" selector="#save-button" timeout="30"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewBlockBlockBasicFieldsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewBlockBlockBasicFieldsSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection.xml
index e57abf7f1025e..00b81686f7167 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewBlockBlockBasicFieldsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsNewBlockBlockBasicFieldsSection">
         <element name="title" type="input" selector="input[name=title]"/>
         <element name="identifier" type="input" selector="input[name=identifier]"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
index 64ee4262a51dd..810c482dffd1a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsNewPagePageActionsSection">
         <element name="savePage" type="button" selector="#save_and_close" timeout="10"/>
         <element name="reset" type="button" selector="#reset"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageBasicFieldsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageBasicFieldsSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml
index cb2b5f0d9c947..468dbecb20e02 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageBasicFieldsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageBasicFieldsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsNewPagePageBasicFieldsSection">
         <element name="pageTitle" type="input" selector="input[name=title]"/>
         <element name="isActive" type="button" selector="//input[@name='is_active' and @value='{{var1}}']" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageContentSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml
index fefd047de6148..8015134c90f9c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageContentSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsNewPagePageContentSection">
         <element name="header" type="button" selector="div[data-index=content]"/>
         <element name="contentHeading" type="input" selector="input[name=content_heading]"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageSeoSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageSeoSection.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageSeoSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageSeoSection.xml
index c0ccda1ff5475..0fe9c01d36fcb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageSeoSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageSeoSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsNewPagePageSeoSection">
         <element name="header" type="button" selector="div[data-index=search_engine_optimisation]" timeout="30"/>
         <element name="urlKey" type="input" selector="input[name=identifier]"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
index 7d4b06ff6d947..b27fb84e98a08 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsPagesPageActionsSection">
         <element name="filterButton" type="input" selector="//button[text()='Filters']"/>
         <element name="URLKey" type="input" selector="//div[@class='admin__form-field-control']/input[@name='identifier']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CustomVariableSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CustomVariableSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CustomVariableSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/CustomVariableSection.xml
index fed4755356bf1..354c86cfc4b3f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CustomVariableSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CustomVariableSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CustomVariableSection">
         <element name="GridCustomVariableCode" type="text" selector=".//*[@id='customVariablesGrid_table']/tbody//tr//td[contains(text(), '{{var1}}')]" parameterized="true"/>
         <element name="variableCode" type="input" selector="#code"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontBlockSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontBlockSection.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontBlockSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/StorefrontBlockSection.xml
index 259eb61b4c4dc..fb4abe30b37af 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontBlockSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontBlockSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontBlockSection">
         <element name="mediaDescription" type="text" selector=".widget.block.block-static-block>p>img"/>
         <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
index fc2515636a693..d7c0a41464d21 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontCMSPageSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCMSPageSection">
         <element name="mediaDescription" type="text" selector=".column.main>p>img"/>
         <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontHeaderSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml
similarity index 58%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontHeaderSection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml
index 0a2fb1179ebbd..154bf33ac5661 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/StorefrontHeaderSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontHeaderSection">
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/TinyMCESection.xml
rename to app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index f840840587738..fef9e2d851652 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="TinyMCESection">
         <element name="checkIfContentTabOpen" type="button" selector="//span[text()='Content']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
         <element name="CheckIfTabExpand" type="button" selector="//div[@data-state-collapsible='closed']//span[text()='Content']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
index d08e67999a62e..b37c9e97a78fc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddImageToWYSIWYGBlockTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
index 06265ecba60d4..995f52e42b3a6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGCMSTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddImageToWYSIWYGCMSTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGBlockTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml
index a57e0a1daafb7..d0d8edc6abc91 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddVariableToWYSIWYGBlockTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGCMSTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGCMSTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
index 501eaae76c7ac..a7627b5492d72 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGCMSTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddVariableToWYSIWYGCMSTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGBlockTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml
index 19b7dac734af2..4d93980da9a33 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddWidgetToWYSIWYGBlockTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
index 94a13c282d89a..90caf89c6a0ca 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
index 442fac5fd73f4..89030034dde12 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
index d86bcf36d1b93..5993c7e2b82f3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
index 7f07bdfde24a3..6d626b3a91734 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
index 2e225bfd55de6..69938147444fe 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
index 3313ad3e639fb..c3797d758d860 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
index 177f5c6d77bc2..1574e6bd3b469 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockTest.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsBlockTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockTest.xml
index a5013384c4142..3b80204f5c3d3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateDuplicatedCmsBlockTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsPageTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml
index 717605d74788f..73e38fcdad558 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsPageTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateCmsPageTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml
index f45329f64926e..3d45d4baae748 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest">
         <annotations>
             <features value="Cms"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml
rename to app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml
index 6e02ab67e61d5..2bfdc5f503720 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnCMSPageTest">
         <annotations>
             <features value="Cms"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/composer.json b/app/code/Magento/Cms/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..cdf6572dc1460
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/composer.json
@@ -0,0 +1,28 @@
+{
+    "name": "magento/functional-test-module-cms",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-email": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-variable": "100.0.0-dev",
+        "magento/functional-test-module-widget": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-cms-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/LICENSE.txt b/app/code/Magento/CmsUrlRewrite/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/LICENSE.txt
rename to app/code/Magento/CmsUrlRewrite/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/LICENSE_AFL.txt b/app/code/Magento/CmsUrlRewrite/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/LICENSE_AFL.txt
rename to app/code/Magento/CmsUrlRewrite/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CmsUrlRewrite/Test/Mftf/README.md b/app/code/Magento/CmsUrlRewrite/Test/Mftf/README.md
new file mode 100644
index 0000000000000..4b377286964b1
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewrite/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cms Url Rewrite Functional Tests
+
+The Functional Test Module for **Magento Cms Url Rewrite** module.
diff --git a/app/code/Magento/CmsUrlRewrite/Test/Mftf/composer.json b/app/code/Magento/CmsUrlRewrite/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..9bed46134f87e
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewrite/Test/Mftf/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/functional-test-module-cms-url-rewrite",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-cms": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-url-rewrite": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/Test/Mftf/README.md b/app/code/Magento/CmsUrlRewriteGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..284cf1e935466
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cms Url Rewrite Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Cms Url Rewrite Graph Ql** module.
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/Test/Mftf/composer.json b/app/code/Magento/CmsUrlRewriteGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..edd1c6b352623
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "magento/functional-test-module-cms-url-rewrite-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-url-rewrite-graph-ql": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-cms": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-cms-url-rewrite": "100.0.0-dev",
+        "magento/functional-test-module-catalog-graph-ql": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigAdminAccountSharingActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminAccountSharingActionGroup.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigAdminAccountSharingActionGroup.xml
rename to app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminAccountSharingActionGroup.xml
index efd6574e7f4af..51155423e62bf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigAdminAccountSharingActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAdminAccountSharingActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
 <actionGroup name="ConfigAdminAccountSharingActionGroup">
     <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/system_config/edit/section/admin/" stepKey="navigateToConfigurationPage" />
     <waitForPageLoad stepKey="wait1"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWYSIWYGActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWYSIWYGActionGroup.xml
rename to app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
index 11d7acc61d75e..52adb0b1f50a5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWYSIWYGActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="EnabledWYSIWYG">
         <amOnPage url="admin/admin/system_config/edit/section/cms/" stepKey="navigateToConfigurationPage" />
         <waitForPageLoad stepKey="wait1"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWebUrlOptionsActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
rename to app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
index 56c313688fdb6..056b89624a2f5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWebUrlOptionsActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="EnableWebUrlOptions">
         <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/GeneralConfigurationActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/GeneralConfigurationActionGroup.xml
rename to app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
index 9a990e88455f9..c3c0430a3d58c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/GeneralConfigurationActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="NavigateToDefaultLayoutsSetting">
         <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/RestoreLayoutSettingActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/RestoreLayoutSettingActionGroup.xml
rename to app/code/Magento/Config/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
index ed0b1a352eb86..670cd236be8be 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/RestoreLayoutSettingActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="RestoreLayoutSetting">
         <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/SwitcherActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitcherActionGroup.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/SwitcherActionGroup.xml
rename to app/code/Magento/Config/Test/Mftf/ActionGroup/SwitcherActionGroup.xml
index f127b14931c98..172ace8b18c11 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/SwitcherActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitcherActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SwitchToVersion4ActionGroup">
         <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
         <waitForPageLoad stepKey="waitForConfigPageToLoad"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/LICENSE.txt b/app/code/Magento/Config/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/LICENSE.txt
rename to app/code/Magento/Config/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/LICENSE_AFL.txt b/app/code/Magento/Config/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/LICENSE_AFL.txt
rename to app/code/Magento/Config/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Page/AdminConfigPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Page/AdminConfigPage.xml
rename to app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
index 9ae1ecab1c26e..e517f6ef62c7a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Page/AdminConfigPage.xml
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminConfigPage" url="admin/system_config/" area="admin" module="Magento_Config">
         <section name="AdminConfigSection"/>
     </page>
diff --git a/app/code/Magento/Config/Test/Mftf/README.md b/app/code/Magento/Config/Test/Mftf/README.md
new file mode 100644
index 0000000000000..060168a5fa643
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Config Functional Tests
+
+The Functional Test Module for **Magento Config** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/AdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/AdminConfigSection.xml
rename to app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
index eb5428bb6e7db..a1b8c2f62f7da 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/AdminConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminConfigSection">
         <element name="advancedReportingMenuItem" type="text" selector="//a[contains(concat(' ',normalize-space(@class),' '),'item-nav')]/span[text()='Advanced Reporting']"/>
         <element name="advancedReportingService" type="select" selector="#analytics_general_enabled"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/AdminSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/AdminSection.xml
rename to app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml
index 294f08326f63b..8278c6366b68a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/AdminSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminSection">
         <element name="CheckIfTabExpand" type="button" selector="#admin_security-head:not(.open)"/>
         <element name="SecurityTab" type="button" selector="#admin_security-head"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/GeneralSection.xml b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/GeneralSection.xml
rename to app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
index b51cfc1d316e5..b1454ff07ee9e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/GeneralSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="ContentManagementSection">
         <element name="WYSIWYGOptions" type="button" selector="#cms_wysiwyg-head"/>
         <element name="CheckIfTabExpand" type="button" selector="#cms_wysiwyg-head:not(.open)"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/StoreConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/StoreConfigSection.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/StoreConfigSection.xml
rename to app/code/Magento/Config/Test/Mftf/Section/StoreConfigSection.xml
index 6580d41c06d49..0ff3f3ca55d22 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/StoreConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/StoreConfigSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StoreConfigSection">
         <element name="CheckIfTabExpand" type="button" selector="#general_store_information-head:not(.open)"/>
         <element name="StoreInformation" type="button" selector="#general_store_information-head"/>
diff --git a/app/code/Magento/Config/Test/Mftf/composer.json b/app/code/Magento/Config/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..0dacef66e5dce
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "magento/functional-test-module-config",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-cron": "100.0.0-dev",
+        "magento/functional-test-module-deploy": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-email": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/LICENSE.txt b/app/code/Magento/ConfigurableImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/LICENSE.txt
rename to app/code/Magento/ConfigurableImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/LICENSE_AFL.txt b/app/code/Magento/ConfigurableImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/LICENSE_AFL.txt
rename to app/code/Magento/ConfigurableImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ConfigurableImportExport/Test/Mftf/README.md b/app/code/Magento/ConfigurableImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e496ea6011c7f
--- /dev/null
+++ b/app/code/Magento/ConfigurableImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Configurable Import Export Functional Tests
+
+The Functional Test Module for **Magento Configurable Import Export** module.
diff --git a/app/code/Magento/ConfigurableImportExport/Test/Mftf/composer.json b/app/code/Magento/ConfigurableImportExport/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..74322a53512f9
--- /dev/null
+++ b/app/code/Magento/ConfigurableImportExport/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-configurable-import-export",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-import-export": "100.0.0-dev",
+        "magento/functional-test-module-configurable-product": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-import-export": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/AdminConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/AdminConfigurableProductActionGroup.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
index c2866816110c5..63ef6cb99f8c1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/AdminConfigurableProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Filter the product grid and view expected products-->
     <actionGroup name="viewConfigurableProductInAdminGrid">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/ConfigurableProductCheckoutActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
index 78a7e8e09ad03..f272fa8ea733c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductCheckoutActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Check configurable product in checkout cart items -->
     <actionGroup name="CheckConfigurableProductInCheckoutCartItemsActionGroup">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCategoryActionGroup.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
index 6baf48fa6de04..9c160d72acc8d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCategoryActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Check configurable product on the category page -->
     <actionGroup name="StorefrontCheckCategoryConfigurableProduct">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCompareActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCompareActionGroup.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
index 61bc922e6a7e1..62e03b62151a5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCompareActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontCompareActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Check the configurable product in comparison page -->
     <actionGroup name="StorefrontCheckCompareConfigurableProductActionGroup">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductActionGroup.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
index 9358faeca4625..968f8c490af8d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Check the configurable product on the product page -->
     <actionGroup name="StorefrontCheckConfigurableProduct">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductCartActionGroup.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index 3d813d4a06e43..cc88a2c6147ef 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Check Configurable Product in the Cart -->
     <actionGroup name="StorefrontCheckCartConfigurableProductActionGroup">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
index 70e758a51409d..f92b388b46649 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="BaseConfigurableProduct" type="product">
         <data key="sku" unique="suffix">configurable</data>
         <data key="type_id">configurable</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductOptionData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductOptionData.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
index 2174abf07d448..21dcf998a6399 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConfigurableProductOptionData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ConfigurableProductTwoOptions" type="ConfigurableProductOption">
         <var key="attribute_id" entityKey="attribute_id" entityType="ProductAttribute" />
         <data key="label">option</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConstData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConstData.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConstData.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConstData.xml
index 457f59f214f9e..974be1e14a389 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ConstData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConstData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
     <entity name="CONST" type="CONST">
         <data key="three">3</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ProductConfigurableAttributeData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ProductConfigurableAttributeData.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml
index ed8bbc949c550..f99f960f6a945 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ProductConfigurableAttributeData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ProductConfigurableAttributeData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="colorProductAttribute" type="product_attribute">
         <data key="default_label" unique="suffix">Color</data>
         <data key="input_type">Dropdown</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ValueIndexData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ValueIndexData.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ValueIndexData.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ValueIndexData.xml
index e42185e9a01c5..54d489a446fd7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Data/ValueIndexData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ValueIndexData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ValueIndex1" type="ValueIndex">
         <var key="value_index" entityKey="value" entityType="ProductAttributeOption"/>
     </entity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/LICENSE.txt b/app/code/Magento/ConfigurableProduct/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/LICENSE.txt
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/LICENSE_AFL.txt b/app/code/Magento/ConfigurableProduct/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/LICENSE_AFL.txt
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_add_child-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_add_child-meta.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_add_child-meta.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_add_child-meta.xml
index 9799409c7de43..6a77e97d8f276 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_add_child-meta.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_add_child-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="ConfigurableProductAddChild" dataType="ConfigurableProductAddChild" type="create" auth="adminOauth" url="/V1/configurable-products/{sku}/child" method="POST">
         <contentType>application/json</contentType>
         <field key="childSku">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_options-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_options-meta.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_options-meta.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_options-meta.xml
index d110dce403a90..37e6be683c2fe 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/configurable_product_options-meta.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/configurable_product_options-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateConfigurableProductOption" dataType="ConfigurableProductOption" type="create" auth="adminOauth" url="/V1/configurable-products/{sku}/options" method="POST">
         <contentType>application/json</contentType>
         <object dataType="ConfigurableProductOption" key="option">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/extension_attribute_configurable_product_options-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/extension_attribute_configurable_product_options-meta.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/extension_attribute_configurable_product_options-meta.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/extension_attribute_configurable_product_options-meta.xml
index 68be11fc2dca3..2f1db19a1fd64 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/extension_attribute_configurable_product_options-meta.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/extension_attribute_configurable_product_options-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateExtensionAttributeConfigProductOption" dataType="ExtensionAttributeConfigProductOption" type="create">
         <contentType>application/json</contentType>
         <array key="configurable_product_options">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/valueIndex-meta.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/valueIndex-meta.xml
similarity index 63%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/valueIndex-meta.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/valueIndex-meta.xml
index 891281cba01ca..8d955fcc94431 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Metadata/valueIndex-meta.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Metadata/valueIndex-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="ValueIndex" dataType="ValueIndex" type="create">
         <field key="value_index">integer</field>
     </operation>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Page/AdminProductCreatePage.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Page/AdminProductCreatePage.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml
index 6053aa3085ac0..01a494afd10e0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
         <section name="AdminProductFormConfigurationsSection"/>
         <section name="AdminCreateProductConfigurationsPanel"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/README.md b/app/code/Magento/ConfigurableProduct/Test/Mftf/README.md
new file mode 100644
index 0000000000000..fb3770d722a63
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Configurable Product Functional Tests
+
+The Functional Test Module for **Magento Configurable Product** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminChooseAffectedAttributeSetSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminChooseAffectedAttributeSetSection.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
index 69f81a2360999..dac7027b73951 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminChooseAffectedAttributeSetSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminChooseAffectedAttributeSetPopup">
         <element name="confirm" type="button" selector="button[data-index='confirm_button']" timeout="30"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
index 99f6a8842481e..e04dbf274d932 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCreateProductConfigurationsPanel">
         <element name="next" type="button" selector=".steps-wizard-navigation .action-next-step" timeout="30"/>
         <element name="createNewAttribute" type="button" selector=".select-attributes-actions button[title='Create New Attribute']" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminNewAttributePanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminNewAttributePanelSection.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
index 469afa426bc1f..f42a1f4d8dbd7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminNewAttributePanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminNewAttributePanel">
         <element name="container" type="text" selector="#create_new_attribute"/>
         <element name="saveAttribute" type="button" selector="#save"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
index 43bf9822903be..6b278237b6599 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductFormConfigurationsSection">
         <element name="createConfigurations" type="button" selector="button[data-index='create_configurable_products_button']" timeout="30"/>
         <element name="currentVariationsRows" type="button" selector=".data-row"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductGridActionSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductGridActionSection.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductGridActionSection.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductGridActionSection.xml
index c09e58294abcc..1d4ec9270ef8f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductGridActionSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductGridActionSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductGridActionSection">
         <element name="addConfigurableProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-configurable']" timeout="30"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/StorefrontProductInfoMainSection.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 45bf866551319..4f96ea41eac5a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoMainSection">
         <element name="optionByAttributeId" type="input" selector="#attribute{{var1}}" parameterized="true"/>
         <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminAddDefaultImageConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminAddDefaultImageConfigurableTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
index 55d6029c917ce..7dbacfa2ce612 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminAddDefaultImageConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultImageConfigurableTest">
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductCreateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductCreateTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
index 55a7e21729d78..17ace8419c034 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductCreateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminConfigurableProductCreateTest">
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductDeleteTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductDeleteTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml
index 02f742cd5f1c4..17f17323a9edd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductDeleteTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminConfigurableProductDeleteTest">
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductOutOfStockTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductOutOfStockTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml
index 96651e303c5f2..f1fae2218301f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductOutOfStockTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest.xml
@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <test name="AdminConfigurableProductOutOfStockTest">
-        <annotations>
-            <features value="ConfigurableProduct"/>
-            <stories value="Product visibility when in stock/out of stock"/>
-            <title value="Configurable Product goes 'Out of Stock' if all associated Simple Products are 'Out of Stock'"/>
-            <description value="Configurable Product goes 'Out of Stock' if all associated Simple Products are 'Out of Stock'"/>
-            <testCaseId value="MC-181"/>
-            <group value="ConfigurableProduct"/>
-        </annotations>
-        <before>
-            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
-            <!-- Create the category to put the product in -->
-            <createData entity="ApiCategory" stepKey="createCategory"/>
-
-            <!-- Create the configurable product based on the data in the /data folder -->
-            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-
-            <!-- Make the configurable product have two options, that are children of the default attribute set -->
-            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
-            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </createData>
-            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </createData>
-            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </createData>
-            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </getData>
-            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-            </getData>
-
-            <!-- Create the 2 children that will be a part of the configurable product -->
-            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-            </createData>
-            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-            </createData>
-
-            <!-- Assign the two products to the configurable product -->
-            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
-                <requiredEntity createDataKey="createConfigProduct"/>
-                <requiredEntity createDataKey="createConfigProductAttribute"/>
-                <requiredEntity createDataKey="getConfigAttributeOption1"/>
-                <requiredEntity createDataKey="getConfigAttributeOption2"/>
-            </createData>
-            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
-                <requiredEntity createDataKey="createConfigProduct"/>
-                <requiredEntity createDataKey="createConfigChildProduct1"/>
-            </createData>
-            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
-                <requiredEntity createDataKey="createConfigProduct"/>
-                <requiredEntity createDataKey="createConfigChildProduct2"/>
-            </createData>
-
-            <!-- log in -->
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
-        </before>
-
-        <after>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
-            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
-            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
-            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-        </after>
-
-        <!-- Check to make sure that the configurable product shows up as in stock -->
-        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage"/>
-        <waitForPageLoad stepKey="waitForStoreFrontLoad"/>
-        <see stepKey="lookForOutOfStock" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK" />
-
-        <!-- Find the first simple product that we just created using the product grid and go to its page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductGridLoad"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
-        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
-            <argument name="product" value="ApiSimpleOne"/>
-        </actionGroup>
-        <waitForPageLoad stepKey="waitForFiltersToBeApplied"/>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-
-        <!-- Edit the quantity of the simple first product as 0 -->
-        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-        <waitForPageLoad stepKey="waitForProductPageSaved"/>
-
-        <!-- Check to make sure that the configurable product shows up as in stock -->
-        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage2"/>
-        <waitForPageLoad stepKey="waitForStoreFrontLoad2"/>
-        <see stepKey="lookForOutOfStock2" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK"/>
-
-        <!-- Find the second simple product that we just created using the product grid and go to its page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage2"/>
-        <waitForPageLoad stepKey="waitForAdminProductGridLoad2"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
-        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct2">
-            <argument name="product" value="ApiSimpleTwo"/>
-        </actionGroup>
-        <waitForPageLoad stepKey="waitForFiltersToBeApplied2"/>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage2"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
-
-        <!-- Edit the quantity of the second simple product as 0 -->
-        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity2"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct2"/>
-        <waitForPageLoad stepKey="waitForProductPageSaved2"/>
-
-        <!-- Check to make sure that the configurable product shows up as out of stock -->
-        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage3"/>
-        <waitForPageLoad stepKey="waitForStoreFrontLoad3"/>
-        <see stepKey="lookForOutOfStock3" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="OUT OF STOCK"/>
-    </test>
-</tests>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminConfigurableProductOutOfStockTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Product visibility when in stock/out of stock"/>
+            <title value="Configurable Product goes 'Out of Stock' if all associated Simple Products are 'Out of Stock'"/>
+            <description value="Configurable Product goes 'Out of Stock' if all associated Simple Products are 'Out of Stock'"/>
+            <testCaseId value="MC-181"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
+            <!-- Create the category to put the product in -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+
+            <!-- Create the configurable product based on the data in the /data folder -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the 2 children that will be a part of the configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Assign the two products to the configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <!-- log in -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!-- Check to make sure that the configurable product shows up as in stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad"/>
+        <see stepKey="lookForOutOfStock" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK" />
+
+        <!-- Find the first simple product that we just created using the product grid and go to its page-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad stepKey="waitForAdminProductGridLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
+            <argument name="product" value="ApiSimpleOne"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForFiltersToBeApplied"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!-- Edit the quantity of the simple first product as 0 -->
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <waitForPageLoad stepKey="waitForProductPageSaved"/>
+
+        <!-- Check to make sure that the configurable product shows up as in stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage2"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad2"/>
+        <see stepKey="lookForOutOfStock2" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK"/>
+
+        <!-- Find the second simple product that we just created using the product grid and go to its page-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage2"/>
+        <waitForPageLoad stepKey="waitForAdminProductGridLoad2"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct2">
+            <argument name="product" value="ApiSimpleTwo"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForFiltersToBeApplied2"/>
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage2"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+
+        <!-- Edit the quantity of the second simple product as 0 -->
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity2"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct2"/>
+        <waitForPageLoad stepKey="waitForProductPageSaved2"/>
+
+        <!-- Check to make sure that the configurable product shows up as out of stock -->
+        <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage3"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad3"/>
+        <see stepKey="lookForOutOfStock3" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="OUT OF STOCK"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductSearchTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest.xml
index 5da689aa5e61c..77ccf7bc6900b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductSearchTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminConfigurableProductSearchTest">
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductUpdateAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductUpdateAttributeTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml
index a8eabb3b56a39..2282da467a967 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductUpdateAttributeTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminConfigurableProductUpdateAttributeTest">
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductUpdateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
similarity index 99%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductUpdateTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
index d640e243c0572..154ce019f8c16 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductUpdateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminConfigurableProductBulkUpdateTest">
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRelatedProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRelatedProductsTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
index 50fb6bdf866d8..4461c06ed6b51 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRelatedProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminRelatedProductsTest">
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRemoveDefaultImageConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRemoveDefaultImageConfigurableTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
index 287cdce875d77..1c34566322c23 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRemoveDefaultImageConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultImageConfigurableTest">
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
index 609ccbb4c27a2..9467f82ebae24 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="ConfigurableProductPriceAdditionalStoreViewTest">
         <annotations>
             <features value="ConfigurableProductPriceStoreFront"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CAdminTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index 44b59de43a9be..a00ce52f442d7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CAdminTest">
         <!--Create configurable product-->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageConfigurable" after="seeSimpleProductInGrid"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
similarity index 99%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CGuestUserTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 2102bf0a24195..1f7b2bff0a7de 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CGuestUserTest">
         <before>
             <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
similarity index 99%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CLoggedInUserTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index 3d29b0e96c874..07e2ecf86ca9e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CLoggedInUserTest">
         <before>
             <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/StorefrontConfigurableProductDetailsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/StorefrontConfigurableProductDetailsTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml
index e7f733cf010f3..3b0f5752ebf5d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/StorefrontConfigurableProductDetailsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontConfigurableProductBasicInfoTest">
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/StorefrontConfigurableProductViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/StorefrontConfigurableProductViewTest.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
index baaa5c4ef938f..b8e894ccf3606 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/StorefrontConfigurableProductViewTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontConfigurableProductGridViewTest">
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/composer.json b/app/code/Magento/ConfigurableProduct/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..78063660f0025
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/composer.json
@@ -0,0 +1,34 @@
+{
+    "name": "magento/functional-test-module-configurable-product",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-msrp": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-webapi": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-product-video": "100.0.0-dev",
+        "magento/functional-test-module-configurable-sample-data": "100.0.0-dev",
+        "magento/functional-test-module-product-links-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Test/Mftf/README.md b/app/code/Magento/ConfigurableProductGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..4204eeb6a0874
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Configurable Product Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Configurable Product Graph Ql** module.
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Test/Mftf/composer.json b/app/code/Magento/ConfigurableProductGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..6d32ef35f6eb2
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/functional-test-module-configurable-product-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-configurable-product": "100.0.0-dev",
+        "magento/functional-test-module-catalog-graph-ql": "100.0.0-dev",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/LICENSE.txt b/app/code/Magento/ConfigurableProductSales/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/LICENSE.txt
rename to app/code/Magento/ConfigurableProductSales/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/LICENSE_AFL.txt b/app/code/Magento/ConfigurableProductSales/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/LICENSE_AFL.txt
rename to app/code/Magento/ConfigurableProductSales/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ConfigurableProductSales/Test/Mftf/README.md b/app/code/Magento/ConfigurableProductSales/Test/Mftf/README.md
new file mode 100644
index 0000000000000..944286966a7ad
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductSales/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Configurable Product Sales Functional Tests
+
+The Functional Test Module for **Magento Configurable Product Sales** module.
diff --git a/app/code/Magento/ConfigurableProductSales/Test/Mftf/composer.json b/app/code/Magento/ConfigurableProductSales/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..416e6a0c45ce1
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductSales/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-configurable-product-sales",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-configurable-product": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/LICENSE.txt b/app/code/Magento/Contact/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/LICENSE.txt
rename to app/code/Magento/Contact/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/LICENSE_AFL.txt b/app/code/Magento/Contact/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/LICENSE_AFL.txt
rename to app/code/Magento/Contact/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Contact/Test/Mftf/README.md b/app/code/Magento/Contact/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e2f9a58f72089
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Contact Functional Tests
+
+The Functional Test Module for **Magento Contact** module.
diff --git a/app/code/Magento/Contact/Test/Mftf/composer.json b/app/code/Magento/Contact/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..824257ae8d0c4
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-contact",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-cms": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/LICENSE.txt b/app/code/Magento/Cookie/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/LICENSE.txt
rename to app/code/Magento/Cookie/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/LICENSE_AFL.txt b/app/code/Magento/Cookie/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/LICENSE_AFL.txt
rename to app/code/Magento/Cookie/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Cookie/Test/Mftf/README.md b/app/code/Magento/Cookie/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c06fe5dcd60de
--- /dev/null
+++ b/app/code/Magento/Cookie/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cookie Functional Tests
+
+The Functional Test Module for **Magento Cookie** module.
diff --git a/app/code/Magento/Cookie/Test/Mftf/composer.json b/app/code/Magento/Cookie/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..54578425c5516
--- /dev/null
+++ b/app/code/Magento/Cookie/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-cookie",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-backend": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/LICENSE.txt b/app/code/Magento/Cron/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/LICENSE.txt
rename to app/code/Magento/Cron/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/LICENSE_AFL.txt b/app/code/Magento/Cron/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/LICENSE_AFL.txt
rename to app/code/Magento/Cron/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Cron/Test/Mftf/README.md b/app/code/Magento/Cron/Test/Mftf/README.md
new file mode 100644
index 0000000000000..76e02eadfb055
--- /dev/null
+++ b/app/code/Magento/Cron/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Cron Functional Tests
+
+The Functional Test Module for **Magento Cron** module.
diff --git a/app/code/Magento/Cron/Test/Mftf/composer.json b/app/code/Magento/Cron/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..a091882117d12
--- /dev/null
+++ b/app/code/Magento/Cron/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-cron",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/LICENSE.txt b/app/code/Magento/CurrencySymbol/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/LICENSE.txt
rename to app/code/Magento/CurrencySymbol/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/LICENSE_AFL.txt b/app/code/Magento/CurrencySymbol/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/LICENSE_AFL.txt
rename to app/code/Magento/CurrencySymbol/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/README.md b/app/code/Magento/CurrencySymbol/Test/Mftf/README.md
new file mode 100644
index 0000000000000..5a927d934494a
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Currency Symbol Functional Tests
+
+The Functional Test Module for **Magento Currency Symbol** module.
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/composer.json b/app/code/Magento/CurrencySymbol/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..ca14f3ebd0bf9
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-currency-symbol",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-page-cache": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/LoginToStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/LoginToStorefrontActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
index ee455a4c03984..1a4e9071d306b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/LoginToStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/LoginToStorefrontActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="LoginToStorefrontActionGroup">
         <arguments>
             <argument name="Customer"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
index a050161af2f4c..3d6e0fb54b054 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="OpenEditCustomerFromAdminActionGroup">
         <arguments>
             <argument name="customer"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
index 04c50378c6607..531e0f4b23b91 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SignUpNewUserFromStorefrontActionGroup">
         <arguments>
             <argument name="Customer"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/AddressData.xml
rename to app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index efa7a1cdb5e69..19194ae2e5423 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="CustomerAddressSimple" type="address">
         <data key="id">0</data>
         <data key="customer_id">12</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerData.xml
rename to app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index 4d65f2aa56b65..1827824ba4b92 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="CustomerEntityOne" type="customer">
         <data key="group_id">0</data>
         <data key="default_billing">defaultBillingValue</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerGroupData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerGroupData.xml
rename to app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
index 5279f4216898e..cc8e16f017f8e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerGroupData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="GeneralCustomerGroup" type="customerGroup">
         <data key="code">General</data>
         <data key="tax_class_id">3</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/ExtensionAttributeSimple.xml b/app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml
similarity index 62%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/ExtensionAttributeSimple.xml
rename to app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml
index ff02f8f165b0f..fee4463709dd5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/ExtensionAttributeSimple.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/ExtensionAttributeSimple.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ExtensionAttributeSimple" type="extension_attribute">
         <data key="is_subscribed">true</data>
     </entity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/RegionData.xml b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/RegionData.xml
rename to app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
index 95e0362e84d71..747f2d59745a1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/RegionData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="CustomerRegionOne" type="region">
         <data key="region_code">100</data>
         <data key="region_id">12</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/LICENSE.txt b/app/code/Magento/Customer/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/LICENSE.txt
rename to app/code/Magento/Customer/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/LICENSE_AFL.txt b/app/code/Magento/Customer/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/LICENSE_AFL.txt
rename to app/code/Magento/Customer/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/address-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/address-meta.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/address-meta.xml
rename to app/code/Magento/Customer/Test/Mftf/Metadata/address-meta.xml
index 62e075c8679e5..deb911f244f11 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/address-meta.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/address-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateAddress" dataType="address" type="create">
         <field key="region">region</field>
         <field key="country_id">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer-meta.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer-meta.xml
rename to app/code/Magento/Customer/Test/Mftf/Metadata/customer-meta.xml
index 882b4cf6e4046..ab2ee2aeddb54 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer-meta.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateCustomer" dataType="customer" type="create" auth="adminOauth" url="/V1/customers" method="POST">
         <contentType>application/json</contentType>
         <object dataType="customer" key="customer">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_extension_attribute-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_extension_attribute-meta.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_extension_attribute-meta.xml
rename to app/code/Magento/Customer/Test/Mftf/Metadata/customer_extension_attribute-meta.xml
index 83028f3dbc13f..8561e937221a9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_extension_attribute-meta.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_extension_attribute-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="create">
         <field key="is_subscribed">boolean</field>
         <field key="extension_attribute">customer_nested_extension_attribute</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_nested_extension_attribute-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_nested_extension_attribute-meta.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_nested_extension_attribute-meta.xml
rename to app/code/Magento/Customer/Test/Mftf/Metadata/customer_nested_extension_attribute-meta.xml
index 0db3b0d9e7c92..eb9829cca4981 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/customer_nested_extension_attribute-meta.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/customer_nested_extension_attribute-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateNestedExtensionAttribute" dataType="customer_nested_extension_attribute" type="create">
         <field key="id">integer</field>
         <field key="customer_id">integer</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/region-meta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/region-meta.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/region-meta.xml
rename to app/code/Magento/Customer/Test/Mftf/Metadata/region-meta.xml
index 1815eb54b2a91..3dd019462c846 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Metadata/region-meta.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/region-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateRegion" dataType="region" type="create">
         <field key="region_code">string</field>
         <field key="region">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminCustomerPage.xml
rename to app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml
index 4ee00034e867a..06ab646aa4c75 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminCustomerPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminCustomerPage" url="/customer/index/" area="admin" module="Magento_Customer">
         <section name="AdminCustomerGridMainActionsSection"/>
         <section name="AdminCustomerMessagesSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminEditCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminEditCustomerPage.xml
rename to app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
index 19f2cd54e7992..9a28bad4e0d6a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminEditCustomerPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
@@ -6,7 +6,7 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminEditCustomerPage" url="/customer/index/edit/id/{{var1}}" area="admin" module="Magento_Customer" parameterized="true">
         <section name="AdminCustomerAccountInformationSection"/>
         <section name="AdminCustomerMainActionsSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminNewCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerPage.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminNewCustomerPage.xml
rename to app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerPage.xml
index 21307e7c3d0f0..646f03181d8fa 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminNewCustomerPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminNewCustomerPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminNewCustomerPage" url="/customer/index/new" area="admin" module="Magento_Customer">
         <section name="AdminCustomerAccountInformationSection"/>
         <section name="AdminCustomerMainActionsSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerCreatePage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerCreatePage.xml
rename to app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
index 8e0dc1079137c..ba61cbb0bca42 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerCreatePage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontCustomerCreatePage" url="/customer/account/create/" area="storefront" module="Magento_Customer">
         <section name="StorefrontCustomerCreateFormSection" />
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerDashboardPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerDashboardPage.xml
rename to app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml
index 21afad8803170..941e247e18b8c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerDashboardPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontCustomerDashboardPage" url="/customer/account/" area="storefront" module="Magento_Customer">
         <section name="StorefrontCustomerDashboardAccountInformationSection" />
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerOrderPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerOrderPage.xml
rename to app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml
index ab66fe2556758..bd25c67c8c907 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerOrderPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderPage.xml
@@ -6,7 +6,7 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontCustomerOrderPage" url="sales/order/view/order_id/" area="storefront" module="Magento_Customer">
         <section name="StorefrontCustomerOrderViewSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerOrderViewPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerOrderViewPage.xml
rename to app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml
index 2e754d6da74c6..7e6cebe6f3c78 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerOrderViewPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerOrderViewPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontCustomerOrderViewPage" url="sales/order/view/order_id/{{var1}}" area="storefront" module="Magento_Customer" parameterized="true">
         <section name="StorefrontCustomerOrderSection" />
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerSignInPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerSignInPage.xml
rename to app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml
index 908c3695342d5..f6673227beada 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerSignInPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerSignInPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontCustomerSignInPage" url="/customer/account/login/" area="storefront" module="Magento_Customer">
         <section name="StorefrontCustomerSignInFormSection" />
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontHomePage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontHomePage.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontHomePage.xml
rename to app/code/Magento/Customer/Test/Mftf/Page/StorefrontHomePage.xml
index cbc04aa33b9a6..6b65bd97e8cb3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontHomePage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontHomePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontHomePage" url="/" area="storefront" module="Magento_Customer">
         <section name="StorefrontPanelHeader" />
     </page>
diff --git a/app/code/Magento/Customer/Test/Mftf/README.md b/app/code/Magento/Customer/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f9fe1cd5b4a39
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Customer Functional Tests
+
+The Functional Test Module for **Magento Customer** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerAccountInformationSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
index 4c72be870f161..647cc6e3ee11f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCustomerAccountInformationSection">
         <element name="accountInformationTitle" type="text" selector=".admin__page-nav-title"/>
         <element name="firstName" type="input" selector="input[name='customer[firstname]']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerFiltersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerFiltersSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
index f5fefb156b8b6..7d106a35f0e13 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerFiltersSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCustomerFiltersSection">
-        <element name="filtersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button" timeout="30"/>
-        <element name="nameInput" type="input" selector="input[name=name]"/>
-        <element name="emailInput" type="input" selector="input[name=email]"/>
-        <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
-    </section>
-</sections>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerFiltersSection">
+        <element name="filtersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button" timeout="30"/>
+        <element name="nameInput" type="input" selector="input[name=name]"/>
+        <element name="emailInput" type="input" selector="input[name=email]"/>
+        <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
+    </section>
+</sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridMainActionsSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
index 3e43fdc923a05..760b2c3663322 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridMainActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCustomerGridMainActionsSection">
         <element name="addNewCustomer" type="button" selector="#add" timeout="30"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
index 314e749b1fadf..515d5eed1124b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCustomerGridSection">
         <element name="customerGrid" type="text" selector="table[data-role='grid']"/>
         <element name="firstRowEditLink" type="text" selector="tr[data-repeat-index='0'] .action-menu-item" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMainActionsSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
index cea098694771a..1aadcb2fa469f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMainActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCustomerMainActionsSection">
         <element name="saveButton" type="button" selector="#save" timeout="30"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMessagesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMessagesSection.xml
similarity index 64%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMessagesSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMessagesSection.xml
index 957c9d9df370f..08c29473a7ee6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMessagesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMessagesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCustomerMessagesSection">
         <element name="successMessage" type="text" selector=".message-success"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminEditCustomerInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminEditCustomerInformationSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml
index 7b98951771c24..76feb2624b5ed 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminEditCustomerInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminEditCustomerInformationSection">
         <element name="orders" type="button" selector="#tab_orders_content" timeout="30"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminEditCustomerOrdersSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerOrdersSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminEditCustomerOrdersSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerOrdersSection.xml
index 2e685d636d1c7..bce4a7e848c13 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminEditCustomerOrdersSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerOrdersSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminEditCustomerOrdersSection">
         <element name="orderGrid" type="text" selector="#customer_orders_grid_table"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerCreateFormSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
index 7cc7188e285dd..adf898a65f212 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerCreateFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerCreateFormSection">
         <element name="firstnameField" type="input" selector="#firstname"/>
         <element name="lastnameField" type="input" selector="#lastname"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerDashboardAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerDashboardAccountInformationSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
index 001dde0b98afd..0d443172e0c66 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerDashboardAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerDashboardAccountInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerDashboardAccountInformationSection">
         <element name="ContactInformation" type="textarea" selector=".box.box-information .box-content"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerOrderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerOrderSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
index e12cbe0aa3ed4..c39dfef5f74e7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerOrderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerOrderSection">
         <element name="productCustomOptions" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[normalize-space(.)='{{var3}}']" parameterized="true"/>
         <element name="productCustomOptionsFile" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[contains(.,'{{var3}}')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerOrderViewSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerOrderViewSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
index 4dee05cb28ed4..9ea271dad7b21 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerOrderViewSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerOrderViewSection">
         <element name="reorder" type="text" selector="a.action.order" timeout="30"/>
         <element name="orderTitle" type="text" selector=".page-title span"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
similarity index 72%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerSignInFormSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
index 9c005876b911a..9cc4a43d31bc6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerSignInFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerSignInFormSection">
         <element name="emailField" type="input" selector="#email"/>
         <element name="passwordField" type="input" selector="#pass"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
index f3efca32c3243..d1a3e44416349 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontPanelHeaderSection">
         <element name="WelcomeMessage" type="text" selector=".greet.welcome span"/>
         <element name="createAnAccountLink" type="select" selector=".panel.header li:nth-child(3)"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml
rename to app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
index 17c7b8410b705..adca5b7ec4d2d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateCustomerTest">
         <annotations>
             <features value="Customer"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml
rename to app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index cc1fc78ca691a..a9563c4cc93d8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CLoggedInUserTest">
         <annotations>
             <features value="End to End scenarios"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/StorefrontCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/StorefrontCreateCustomerTest.xml
rename to app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml
index 92893e76d42c2..3670cdba3872d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/StorefrontCreateCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontCreateCustomerTest">
         <annotations>
             <features value="Customer"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/StorefrontPersistedCustomerLoginTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/StorefrontPersistedCustomerLoginTest.xml
rename to app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml
index 27e4db958cbfe..ec669be165e68 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/StorefrontPersistedCustomerLoginTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontPersistedCustomerLoginTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontPersistedCustomerLoginTest">
         <annotations>
             <features value="Customer"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/composer.json b/app/code/Magento/Customer/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..4bf83a4bf800a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/composer.json
@@ -0,0 +1,39 @@
+{
+    "name": "magento/functional-test-module-customer",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-authorization": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-integration": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-newsletter": "100.0.0-dev",
+        "magento/functional-test-module-page-cache": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-review": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-wishlist": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-cookie": "100.0.0-dev",
+        "magento/functional-test-module-customer-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/LICENSE.txt b/app/code/Magento/CustomerAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/LICENSE.txt
rename to app/code/Magento/CustomerAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/LICENSE_AFL.txt b/app/code/Magento/CustomerAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/CustomerAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CustomerAnalytics/Test/Mftf/README.md b/app/code/Magento/CustomerAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..85cd1aea0e5bd
--- /dev/null
+++ b/app/code/Magento/CustomerAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Customer Analytics Functional Tests
+
+The Functional Test Module for **Magento Customer Analytics** module.
diff --git a/app/code/Magento/CustomerAnalytics/Test/Mftf/composer.json b/app/code/Magento/CustomerAnalytics/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..9b90f06de29c6
--- /dev/null
+++ b/app/code/Magento/CustomerAnalytics/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-customer-analytics",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-customer": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md b/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ae023224f4d9b
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Customer Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Customer Graph Ql** module.
diff --git a/app/code/Magento/CustomerGraphQl/Test/Mftf/composer.json b/app/code/Magento/CustomerGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..b173084a84d10
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-customer-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-authorization": "100.0.0-dev",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-graph-ql": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/LICENSE.txt b/app/code/Magento/CustomerImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/LICENSE.txt
rename to app/code/Magento/CustomerImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/LICENSE_AFL.txt b/app/code/Magento/CustomerImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/LICENSE_AFL.txt
rename to app/code/Magento/CustomerImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/CustomerImportExport/Test/Mftf/README.md b/app/code/Magento/CustomerImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..65dfc18397eda
--- /dev/null
+++ b/app/code/Magento/CustomerImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Customer Import Export Functional Tests
+
+The Functional Test Module for **Magento Customer Import Export** module.
diff --git a/app/code/Magento/CustomerImportExport/Test/Mftf/composer.json b/app/code/Magento/CustomerImportExport/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..adddda9ff7370
--- /dev/null
+++ b/app/code/Magento/CustomerImportExport/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-customer-import-export",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-import-export": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/LICENSE.txt b/app/code/Magento/Deploy/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/LICENSE.txt
rename to app/code/Magento/Deploy/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/LICENSE_AFL.txt b/app/code/Magento/Deploy/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/LICENSE_AFL.txt
rename to app/code/Magento/Deploy/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Deploy/Test/Mftf/README.md b/app/code/Magento/Deploy/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c1852362d4ca3
--- /dev/null
+++ b/app/code/Magento/Deploy/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Deploy Functional Tests
+
+The Functional Test Module for **Magento Deploy** module.
diff --git a/app/code/Magento/Deploy/Test/Mftf/composer.json b/app/code/Magento/Deploy/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..7e18c4d1d1222
--- /dev/null
+++ b/app/code/Magento/Deploy/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-deploy",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-require-js": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-user": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/LICENSE.txt b/app/code/Magento/Developer/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/LICENSE.txt
rename to app/code/Magento/Developer/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/LICENSE_AFL.txt b/app/code/Magento/Developer/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/LICENSE_AFL.txt
rename to app/code/Magento/Developer/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Developer/Test/Mftf/README.md b/app/code/Magento/Developer/Test/Mftf/README.md
new file mode 100644
index 0000000000000..a3510344ff79c
--- /dev/null
+++ b/app/code/Magento/Developer/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Developer Functional Tests
+
+The Functional Test Module for **Magento Developer** module.
diff --git a/app/code/Magento/Developer/Test/Mftf/composer.json b/app/code/Magento/Developer/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..ebd6230526271
--- /dev/null
+++ b/app/code/Magento/Developer/Test/Mftf/composer.json
@@ -0,0 +1,18 @@
+{
+    "name": "magento/functional-test-module-developer",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/LICENSE.txt b/app/code/Magento/Dhl/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/LICENSE.txt
rename to app/code/Magento/Dhl/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/LICENSE_AFL.txt b/app/code/Magento/Dhl/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/LICENSE_AFL.txt
rename to app/code/Magento/Dhl/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Dhl/Test/Mftf/README.md b/app/code/Magento/Dhl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..4be86fcefb775
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Dhl Functional Tests
+
+The Functional Test Module for **Magento Dhl** module.
diff --git a/app/code/Magento/Dhl/Test/Mftf/composer.json b/app/code/Magento/Dhl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..0da17d213c84e
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Mftf/composer.json
@@ -0,0 +1,28 @@
+{
+    "name": "magento/functional-test-module-dhl",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-shipping": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-checkout": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/LICENSE.txt b/app/code/Magento/Directory/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/LICENSE.txt
rename to app/code/Magento/Directory/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/LICENSE_AFL.txt b/app/code/Magento/Directory/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/LICENSE_AFL.txt
rename to app/code/Magento/Directory/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Directory/Test/Mftf/README.md b/app/code/Magento/Directory/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ecbb2bd265402
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Directory Functional Tests
+
+The Functional Test Module for **Magento Directory** module.
diff --git a/app/code/Magento/Directory/Test/Mftf/composer.json b/app/code/Magento/Directory/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..c23156f6d923e
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Mftf/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/functional-test-module-directory",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/ActionGroup/AdminDownloadableProductActionGroup.xml b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/ActionGroup/AdminDownloadableProductActionGroup.xml
rename to app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml
index c1370ddcfb95e..2e1392eb0d2a8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/ActionGroup/AdminDownloadableProductActionGroup.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Fill main fields in product form-->
     <actionGroup name="fillMainDownloadableProductForm">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/LinkData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/LinkData.xml
rename to app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
index 1498f4b96b3ab..16f32942a375f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/LinkData.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="downloadableData" type="downloadable_data">
         <data key="link_title">Downloadable Links</data>
         <data key="sample_title">Downloadable Samples</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/ProductData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/ProductData.xml
rename to app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
index f71ebd481a97d..2c25c2c9b822b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Data/ProductData.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="DownloadableProduct" type="product">
         <data key="sku" unique="suffix">downloadableproduct</data>
         <data key="type_id">downloadable</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/LICENSE.txt b/app/code/Magento/Downloadable/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/LICENSE.txt
rename to app/code/Magento/Downloadable/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/LICENSE_AFL.txt b/app/code/Magento/Downloadable/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/LICENSE_AFL.txt
rename to app/code/Magento/Downloadable/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/downloadable_link-meta.xml b/app/code/Magento/Downloadable/Test/Mftf/Metadata/downloadable_link-meta.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/downloadable_link-meta.xml
rename to app/code/Magento/Downloadable/Test/Mftf/Metadata/downloadable_link-meta.xml
index dc86c4e8d7957..1138b56189137 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/downloadable_link-meta.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Metadata/downloadable_link-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateDownloadableLink" dataType="downloadable_link" type="create" auth="adminOauth" url="/V1/products/{sku}/downloadable-links" method="POST">
         <contentType>application/json</contentType>
         <object dataType="downloadable_link" key="link">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/link_file_content-meta.xml b/app/code/Magento/Downloadable/Test/Mftf/Metadata/link_file_content-meta.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/link_file_content-meta.xml
rename to app/code/Magento/Downloadable/Test/Mftf/Metadata/link_file_content-meta.xml
index 72f643e06800d..de899a9051022 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/link_file_content-meta.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Metadata/link_file_content-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateLinkFileContent" dataType="link_file_content" type="create">
         <field key="file_data">string</field>
         <field key="name">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/sample_file_content-meta.xml b/app/code/Magento/Downloadable/Test/Mftf/Metadata/sample_file_content-meta.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/sample_file_content-meta.xml
rename to app/code/Magento/Downloadable/Test/Mftf/Metadata/sample_file_content-meta.xml
index 144ce67bb25bb..5109263cfc242 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Metadata/sample_file_content-meta.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Metadata/sample_file_content-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateSampleFileContent" dataType="sample_file_content" type="create">
         <field key="file_data">string</field>
         <field key="name">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Page/AdminProductCreatePage.xml b/app/code/Magento/Downloadable/Test/Mftf/Page/AdminProductCreatePage.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Page/AdminProductCreatePage.xml
rename to app/code/Magento/Downloadable/Test/Mftf/Page/AdminProductCreatePage.xml
index cc95f4dc9d2d1..7d5cc562bfb3c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
         <section name="AdminProductDownloadableSection"/>
     </page>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/README.md b/app/code/Magento/Downloadable/Test/Mftf/README.md
new file mode 100644
index 0000000000000..11451fafa33a7
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Downloadable Functional Tests
+
+The Functional Test Module for **Magento Downloadable** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Section/AdminProductDownloadableSection.xml b/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDownloadableSection.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Section/AdminProductDownloadableSection.xml
rename to app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDownloadableSection.xml
index f2420f8719a6a..1c1ce0343c94d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Section/AdminProductDownloadableSection.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Section/AdminProductDownloadableSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductDownloadableSection">
         <element name="sectionHeader" type="button" selector="div[data-index='downloadable']" timeout="30" />
         <element name="isDownloadableProduct" type="input" selector="input[name='is_downloadable']" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdminAddDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdminAddDefaultImageDownloadableProductTest.xml
rename to app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
index e95e788957395..f2c7f6a61388f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdminAddDefaultImageDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultImageDownloadableProductTest">
         <annotations>
             <features value="Downloadable"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdminRemoveDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
rename to app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
index 43d73e45a943f..370148c6a4167 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultImageDownloadableProductTest">
         <annotations>
             <features value="Downloadable"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/EndToEndB2CAdminTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/EndToEndB2CAdminTest.xml
rename to app/code/Magento/Downloadable/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index 86c8fc0bd9ab2..4a4242811a39c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CAdminTest">
         <!--Create Downloadable Product-->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitProductPageDownloadable" after="seeSimpleProductInGrid"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/composer.json b/app/code/Magento/Downloadable/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..6a2a5bb00f01e
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "magento/functional-test-module-downloadable",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-gift-message": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-downloadable-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/DownloadableGraphQl/Test/Mftf/README.md b/app/code/Magento/DownloadableGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..621abd2f1cba5
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Downloadable Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Downloadable Graph Ql** module.
diff --git a/app/code/Magento/DownloadableGraphQl/Test/Mftf/composer.json b/app/code/Magento/DownloadableGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..725f17975e581
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-downloadable-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-downloadable": "100.0.0-dev",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-catalog-graph-ql": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/LICENSE.txt b/app/code/Magento/DownloadableImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/LICENSE.txt
rename to app/code/Magento/DownloadableImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/LICENSE_AFL.txt b/app/code/Magento/DownloadableImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/LICENSE_AFL.txt
rename to app/code/Magento/DownloadableImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/DownloadableImportExport/Test/Mftf/README.md b/app/code/Magento/DownloadableImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..690273be9b8bc
--- /dev/null
+++ b/app/code/Magento/DownloadableImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Downloadable Import Export Functional Tests
+
+The Functional Test Module for **Magento Downloadable Import Export** module.
diff --git a/app/code/Magento/DownloadableImportExport/Test/Mftf/composer.json b/app/code/Magento/DownloadableImportExport/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..da5caa42b87d5
--- /dev/null
+++ b/app/code/Magento/DownloadableImportExport/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-downloadable-import-export",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-import-export": "100.0.0-dev",
+        "magento/functional-test-module-downloadable": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-import-export": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/LICENSE.txt b/app/code/Magento/Eav/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/LICENSE.txt
rename to app/code/Magento/Eav/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/LICENSE_AFL.txt b/app/code/Magento/Eav/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/LICENSE_AFL.txt
rename to app/code/Magento/Eav/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Eav/Test/Mftf/README.md b/app/code/Magento/Eav/Test/Mftf/README.md
new file mode 100644
index 0000000000000..fe122f3227881
--- /dev/null
+++ b/app/code/Magento/Eav/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Eav Functional Tests
+
+The Functional Test Module for **Magento Eav** module.
diff --git a/app/code/Magento/Eav/Test/Mftf/composer.json b/app/code/Magento/Eav/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..8ad451d607263
--- /dev/null
+++ b/app/code/Magento/Eav/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-eav",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/EavGraphQl/Test/Mftf/README.md b/app/code/Magento/EavGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c8fb8f834c6b6
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Eav Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Eav Graph Ql** module.
diff --git a/app/code/Magento/EavGraphQl/Test/Mftf/composer.json b/app/code/Magento/EavGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..f0390a211f3dc
--- /dev/null
+++ b/app/code/Magento/EavGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/functional-test-module-eav-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-graph-ql": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE.txt b/app/code/Magento/Elasticsearch/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE.txt
rename to app/code/Magento/Elasticsearch/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_AFL.txt b/app/code/Magento/Elasticsearch/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_AFL.txt
rename to app/code/Magento/Elasticsearch/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/README.md b/app/code/Magento/Elasticsearch/Test/Mftf/README.md
new file mode 100644
index 0000000000000..de5e558e91cad
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Elasticsearch Functional Tests
+
+The Functional Test Module for **Magento Elasticsearch** module.
diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/composer.json b/app/code/Magento/Elasticsearch/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..4f0b74e9c5660
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Mftf/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/functional-test-module-elasticsearch",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/functional-test-module-advanced-search": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-search": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-search": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/LICENSE.txt b/app/code/Magento/Email/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/LICENSE.txt
rename to app/code/Magento/Email/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/LICENSE_AFL.txt b/app/code/Magento/Email/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/LICENSE_AFL.txt
rename to app/code/Magento/Email/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Email/Test/Mftf/README.md b/app/code/Magento/Email/Test/Mftf/README.md
new file mode 100644
index 0000000000000..217c24a18afd4
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Email Functional Tests
+
+The Functional Test Module for **Magento Email** module.
diff --git a/app/code/Magento/Email/Test/Mftf/composer.json b/app/code/Magento/Email/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..9f9b087c5fc15
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/functional-test-module-email",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-cms": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev",
+        "magento/functional-test-module-variable": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-theme": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/LICENSE.txt b/app/code/Magento/EncryptionKey/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/LICENSE.txt
rename to app/code/Magento/EncryptionKey/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/LICENSE_AFL.txt b/app/code/Magento/EncryptionKey/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/LICENSE_AFL.txt
rename to app/code/Magento/EncryptionKey/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/README.md b/app/code/Magento/EncryptionKey/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ba2ec0103b0b3
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Encryption Key Functional Tests
+
+The Functional Test Module for **Magento Encryption Key** module.
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/composer.json b/app/code/Magento/EncryptionKey/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..732a18753779f
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-encryption-key",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/LICENSE.txt b/app/code/Magento/Fedex/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/LICENSE.txt
rename to app/code/Magento/Fedex/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/LICENSE_AFL.txt b/app/code/Magento/Fedex/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/LICENSE_AFL.txt
rename to app/code/Magento/Fedex/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Fedex/Test/Mftf/README.md b/app/code/Magento/Fedex/Test/Mftf/README.md
new file mode 100644
index 0000000000000..eeba819913c94
--- /dev/null
+++ b/app/code/Magento/Fedex/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Fedex Functional Tests
+
+The Functional Test Module for **Magento Fedex** module.
diff --git a/app/code/Magento/Fedex/Test/Mftf/composer.json b/app/code/Magento/Fedex/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..6152c679ec796
--- /dev/null
+++ b/app/code/Magento/Fedex/Test/Mftf/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/functional-test-module-fedex",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-shipping": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/LICENSE.txt b/app/code/Magento/GiftMessage/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/LICENSE.txt
rename to app/code/Magento/GiftMessage/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/LICENSE_AFL.txt b/app/code/Magento/GiftMessage/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/LICENSE_AFL.txt
rename to app/code/Magento/GiftMessage/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/README.md b/app/code/Magento/GiftMessage/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ebc0422df170d
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Gift Message Functional Tests
+
+The Functional Test Module for **Magento Gift Message** module.
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/composer.json b/app/code/Magento/GiftMessage/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..06f8c507d25c9
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "magento/functional-test-module-gift-message",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-multishipping": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/LICENSE.txt b/app/code/Magento/GoogleAdwords/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/LICENSE.txt
rename to app/code/Magento/GoogleAdwords/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/LICENSE_AFL.txt b/app/code/Magento/GoogleAdwords/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/LICENSE_AFL.txt
rename to app/code/Magento/GoogleAdwords/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/GoogleAdwords/Test/Mftf/README.md b/app/code/Magento/GoogleAdwords/Test/Mftf/README.md
new file mode 100644
index 0000000000000..37f70104c1d28
--- /dev/null
+++ b/app/code/Magento/GoogleAdwords/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Google Adwords Functional Tests
+
+The Functional Test Module for **Magento Google Adwords** module.
diff --git a/app/code/Magento/GoogleAdwords/Test/Mftf/composer.json b/app/code/Magento/GoogleAdwords/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..d40fb323175fe
--- /dev/null
+++ b/app/code/Magento/GoogleAdwords/Test/Mftf/composer.json
@@ -0,0 +1,18 @@
+{
+    "name": "magento/functional-test-module-google-adwords",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/LICENSE.txt b/app/code/Magento/GoogleAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/LICENSE.txt
rename to app/code/Magento/GoogleAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/LICENSE_AFL.txt b/app/code/Magento/GoogleAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/GoogleAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/GoogleAnalytics/Test/Mftf/README.md b/app/code/Magento/GoogleAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..d711849909d43
--- /dev/null
+++ b/app/code/Magento/GoogleAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Google Analytics Functional Tests
+
+The Functional Test Module for **Magento Google Analytics** module.
diff --git a/app/code/Magento/GoogleAnalytics/Test/Mftf/composer.json b/app/code/Magento/GoogleAnalytics/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..3413ffcac6e42
--- /dev/null
+++ b/app/code/Magento/GoogleAnalytics/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-google-analytics",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-cookie": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/LICENSE.txt b/app/code/Magento/GoogleOptimizer/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/LICENSE.txt
rename to app/code/Magento/GoogleOptimizer/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/LICENSE_AFL.txt b/app/code/Magento/GoogleOptimizer/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/LICENSE_AFL.txt
rename to app/code/Magento/GoogleOptimizer/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/GoogleOptimizer/Test/Mftf/README.md b/app/code/Magento/GoogleOptimizer/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c0338246ba9fd
--- /dev/null
+++ b/app/code/Magento/GoogleOptimizer/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Google Optimizer Functional Tests
+
+The Functional Test Module for **Magento Google Optimizer** module.
diff --git a/app/code/Magento/GoogleOptimizer/Test/Mftf/composer.json b/app/code/Magento/GoogleOptimizer/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..2378140ac272a
--- /dev/null
+++ b/app/code/Magento/GoogleOptimizer/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-google-optimizer",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-cms": "100.0.0-dev",
+        "magento/functional-test-module-google-analytics": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/GraphQl/Test/Mftf/README.md b/app/code/Magento/GraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..34fee7717fd31
--- /dev/null
+++ b/app/code/Magento/GraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Graph Ql** module.
diff --git a/app/code/Magento/GraphQl/Test/Mftf/composer.json b/app/code/Magento/GraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..e86f458e9e6a4
--- /dev/null
+++ b/app/code/Magento/GraphQl/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/functional-test-module-authorization": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-webapi": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/LICENSE.txt b/app/code/Magento/GroupedImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/LICENSE.txt
rename to app/code/Magento/GroupedImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/LICENSE_AFL.txt b/app/code/Magento/GroupedImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/LICENSE_AFL.txt
rename to app/code/Magento/GroupedImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/GroupedImportExport/Test/Mftf/README.md b/app/code/Magento/GroupedImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f15893e5138d0
--- /dev/null
+++ b/app/code/Magento/GroupedImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Grouped Import Export Functional Tests
+
+The Functional Test Module for **Magento Grouped Import Export** module.
diff --git a/app/code/Magento/GroupedImportExport/Test/Mftf/composer.json b/app/code/Magento/GroupedImportExport/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..37d7a9ffe9f52
--- /dev/null
+++ b/app/code/Magento/GroupedImportExport/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-grouped-import-export",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-import-export": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-grouped-product": "100.0.0-dev",
+        "magento/functional-test-module-import-export": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/ActionGroup/AdminGroupedProductActionGroup.xml b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/ActionGroup/AdminGroupedProductActionGroup.xml
rename to app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml
index 85762fd45e16d..bf870d3d9e2dd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/ActionGroup/AdminGroupedProductActionGroup.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/AdminGroupedProductActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Check that required fields are actually required-->
     <actionGroup name="checkRequiredFieldsInGroupedProductForm">
         <clearField selector="{{AdminProductFormSection.productName}}" stepKey="clearProductSku"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/GroupedProductData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/GroupedProductData.xml
rename to app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
index 9960d698a7861..1f9f1594f8fcb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/GroupedProductData.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="GroupedProduct" type="product">
         <data key="sku" unique="suffix">groupedproduct</data>
         <data key="type_id">grouped</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/ProductLinkData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkData.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/ProductLinkData.xml
rename to app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkData.xml
index 9a5df1e379a86..2c7cc254c855d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/ProductLinkData.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ProductLinkSimple1" type="product_link">
         <var key="sku" entityKey="sku" entityType="product3"/>
         <var key="linked_product_sku" entityKey="sku" entityType="product"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/ProductLinkExtensionAttributeData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkExtensionAttributeData.xml
similarity index 61%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/ProductLinkExtensionAttributeData.xml
rename to app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkExtensionAttributeData.xml
index 5f5dcb3a0ef4f..433dc920502d4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/ProductLinkExtensionAttributeData.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinkExtensionAttributeData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="Qty1000" type="product_link_extension_attribute">
         <data key="qty">1000</data>
     </entity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/ProductLinksData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinksData.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/ProductLinksData.xml
rename to app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinksData.xml
index 523517aa70080..b712e3f40afd1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Data/ProductLinksData.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/ProductLinksData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="OneSimpleProductLink" type="product_links">
         <requiredEntity type="product_link">ProductLinkSimple1</requiredEntity>
     </entity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/LICENSE.txt b/app/code/Magento/GroupedProduct/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/LICENSE.txt
rename to app/code/Magento/GroupedProduct/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/LICENSE_AFL.txt b/app/code/Magento/GroupedProduct/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/LICENSE_AFL.txt
rename to app/code/Magento/GroupedProduct/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Page/AdminProductCreatePage.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Page/AdminProductCreatePage.xml
rename to app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml
index 9d2b3075df6a9..d8edc37160bab 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
         <section name="AdminProductFormGroupedProductsSection"/>
         <section name="AdminAddProductsToGroupPanel"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/README.md b/app/code/Magento/GroupedProduct/Test/Mftf/README.md
new file mode 100644
index 0000000000000..471745bd46e36
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Grouped Product Functional Tests
+
+The Functional Test Module for **Magento Grouped Product** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Section/AdminAddProductsToGroupPanelSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Section/AdminAddProductsToGroupPanelSection.xml
rename to app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml
index 45e32e7f2cd04..a03b1b34c1a5b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Section/AdminAddProductsToGroupPanelSection.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminAddProductsToGroupPanelSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminAddProductsToGroupPanel">
         <element name="addSelectedProducts" type="button" selector=".product_form_product_form_grouped_grouped_products_modal button.action-primary" timeout="30"/>
         <element name="filters" type="button" selector=".product_form_product_form_grouped_grouped_products_modal [data-action='grid-filter-expand']" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Section/AdminProductFormGroupedProductsSection.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Section/AdminProductFormGroupedProductsSection.xml
rename to app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml
index 99bc5045ac22e..adb0ac5a984a1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Section/AdminProductFormGroupedProductsSection.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Section/AdminProductFormGroupedProductsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductFormGroupedProductsSection">
         <element name="toggleGroupedProduct" type="button" selector="div[data-index=grouped] .admin__collapsible-title"/>
         <element name="addProductsToGroup" type="button" selector="button[data-index='grouped_products_button']" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/AdminAddDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/AdminAddDefaultImageGroupedProductTest.xml
rename to app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
index 2120045513e13..1bee1846ac0f5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/AdminAddDefaultImageGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultImageGroupedProductTest">
         <annotations>
             <features value="GroupedProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/AdminRemoveDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/AdminRemoveDefaultImageGroupedProductTest.xml
rename to app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
index b1105369b2ff5..a0408a744cc7e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/AdminRemoveDefaultImageGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultImageGroupedProductTest">
         <annotations>
             <features value="GroupedProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/EndToEndB2CAdminTest.xml
rename to app/code/Magento/GroupedProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index 7b5612a211af5..60aa666224550 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CAdminTest">
         <!--Create Grouped Product-->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageGrouped" after="seeSimpleProductInGrid"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/composer.json b/app/code/Magento/GroupedProduct/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..ebd0d3656952f
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/composer.json
@@ -0,0 +1,31 @@
+{
+    "name": "magento/functional-test-module-grouped-product",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-msrp": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-grouped-product-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/GroupedProductGraphQl/Test/Mftf/README.md b/app/code/Magento/GroupedProductGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..1c950e855cac0
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Grouped Product Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Grouped Product Graph Ql** module.
diff --git a/app/code/Magento/GroupedProductGraphQl/Test/Mftf/composer.json b/app/code/Magento/GroupedProductGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..6335b45595db7
--- /dev/null
+++ b/app/code/Magento/GroupedProductGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,18 @@
+{
+    "name": "magento/functional-test-module-grouped-product-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/functional-test-module-grouped-product": "100.0.0-dev",
+        "magento/functional-test-module-catalog-graph-ql": "100.0.0-dev",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/LICENSE.txt b/app/code/Magento/ImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/LICENSE.txt
rename to app/code/Magento/ImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/LICENSE_AFL.txt b/app/code/Magento/ImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/LICENSE_AFL.txt
rename to app/code/Magento/ImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ImportExport/Test/Mftf/README.md b/app/code/Magento/ImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f226f9e433316
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Import Export Functional Tests
+
+The Functional Test Module for **Magento Import Export** module.
diff --git a/app/code/Magento/ImportExport/Test/Mftf/composer.json b/app/code/Magento/ImportExport/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..fcce7ec7e84ff
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-import-export",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/LICENSE.txt b/app/code/Magento/Indexer/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/LICENSE.txt
rename to app/code/Magento/Indexer/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/LICENSE_AFL.txt b/app/code/Magento/Indexer/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/LICENSE_AFL.txt
rename to app/code/Magento/Indexer/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Indexer/Test/Mftf/README.md b/app/code/Magento/Indexer/Test/Mftf/README.md
new file mode 100644
index 0000000000000..df1044b36de0c
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Indexer Functional Tests
+
+The Functional Test Module for **Magento Indexer** module.
diff --git a/app/code/Magento/Indexer/Test/Mftf/composer.json b/app/code/Magento/Indexer/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..487c2ac1abc85
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-indexer",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/InstantPurchase/Test/Mftf/README.md b/app/code/Magento/InstantPurchase/Test/Mftf/README.md
new file mode 100644
index 0000000000000..b6fd2db87500b
--- /dev/null
+++ b/app/code/Magento/InstantPurchase/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Instant Purchase Functional Tests
+
+The Functional Test Module for **Magento Instant Purchase** module.
diff --git a/app/code/Magento/InstantPurchase/Test/Mftf/composer.json b/app/code/Magento/InstantPurchase/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..465002e5c4244
--- /dev/null
+++ b/app/code/Magento/InstantPurchase/Test/Mftf/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "magento/functional-test-module-instant-purchase",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-shipping": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-vault": "100.0.0-dev",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/LICENSE.txt b/app/code/Magento/Integration/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/LICENSE.txt
rename to app/code/Magento/Integration/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/LICENSE_AFL.txt b/app/code/Magento/Integration/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/LICENSE_AFL.txt
rename to app/code/Magento/Integration/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Integration/Test/Mftf/README.md b/app/code/Magento/Integration/Test/Mftf/README.md
new file mode 100644
index 0000000000000..bee16720d3c4a
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Integration Functional Tests
+
+The Functional Test Module for **Magento Integration** module.
diff --git a/app/code/Magento/Integration/Test/Mftf/composer.json b/app/code/Magento/Integration/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..7168fc1945dab
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-integration",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-authorization": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-security": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-user": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/LICENSE.txt b/app/code/Magento/LayeredNavigation/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/LICENSE.txt
rename to app/code/Magento/LayeredNavigation/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/LICENSE_AFL.txt b/app/code/Magento/LayeredNavigation/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/LICENSE_AFL.txt
rename to app/code/Magento/LayeredNavigation/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/README.md b/app/code/Magento/LayeredNavigation/Test/Mftf/README.md
new file mode 100644
index 0000000000000..6a6f97798b13c
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Layered Navigation Functional Tests
+
+The Functional Test Module for **Magento Layered Navigation** module.
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/composer.json b/app/code/Magento/LayeredNavigation/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..9d046b8c2a105
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/composer.json
@@ -0,0 +1,18 @@
+{
+    "name": "magento/functional-test-module-layered-navigation",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/LICENSE.txt b/app/code/Magento/Marketplace/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/LICENSE.txt
rename to app/code/Magento/Marketplace/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/LICENSE_AFL.txt b/app/code/Magento/Marketplace/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/LICENSE_AFL.txt
rename to app/code/Magento/Marketplace/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Marketplace/Test/Mftf/README.md b/app/code/Magento/Marketplace/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3612b519cb5be
--- /dev/null
+++ b/app/code/Magento/Marketplace/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Marketplace Functional Tests
+
+The Functional Test Module for **Magento Marketplace** module.
diff --git a/app/code/Magento/Marketplace/Test/Mftf/composer.json b/app/code/Magento/Marketplace/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..3d4fd741bc4ad
--- /dev/null
+++ b/app/code/Magento/Marketplace/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-marketplace",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/LICENSE.txt b/app/code/Magento/MediaStorage/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/LICENSE.txt
rename to app/code/Magento/MediaStorage/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/LICENSE_AFL.txt b/app/code/Magento/MediaStorage/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/LICENSE_AFL.txt
rename to app/code/Magento/MediaStorage/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/MediaStorage/Test/Mftf/README.md b/app/code/Magento/MediaStorage/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f4a5cd473414a
--- /dev/null
+++ b/app/code/Magento/MediaStorage/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Media Storage Functional Tests
+
+The Functional Test Module for **Magento Media Storage** module.
diff --git a/app/code/Magento/MediaStorage/Test/Mftf/composer.json b/app/code/Magento/MediaStorage/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..7e7aeeef14517
--- /dev/null
+++ b/app/code/Magento/MediaStorage/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-media-storage",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/LICENSE.txt b/app/code/Magento/MessageQueue/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/LICENSE.txt
rename to app/code/Magento/MessageQueue/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/LICENSE_AFL.txt b/app/code/Magento/MessageQueue/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/LICENSE_AFL.txt
rename to app/code/Magento/MessageQueue/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/README.md b/app/code/Magento/MessageQueue/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9f6fb3cb1caa5
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Message Queue Functional Tests
+
+The Functional Test Module for **Magento Message Queue** module.
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/composer.json b/app/code/Magento/MessageQueue/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..e499fed390751
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Mftf/composer.json
@@ -0,0 +1,16 @@
+{
+    "name": "magento/functional-test-module-message-queue",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/magento-composer-installer": "100.0.0-dev",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/LICENSE.txt b/app/code/Magento/Msrp/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/LICENSE.txt
rename to app/code/Magento/Msrp/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/LICENSE_AFL.txt b/app/code/Magento/Msrp/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/LICENSE_AFL.txt
rename to app/code/Magento/Msrp/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Msrp/Test/Mftf/README.md b/app/code/Magento/Msrp/Test/Mftf/README.md
new file mode 100644
index 0000000000000..731a425ac7450
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Msrp Functional Tests
+
+The Functional Test Module for **Magento Msrp** module.
diff --git a/app/code/Magento/Msrp/Test/Mftf/composer.json b/app/code/Magento/Msrp/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..cd85cb6cb268a
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Mftf/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/functional-test-module-msrp",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-downloadable": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-grouped-product": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-bundle": "100.0.0-dev",
+        "magento/functional-test-module-msrp-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE.txt b/app/code/Magento/Multishipping/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE.txt
rename to app/code/Magento/Multishipping/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE_AFL.txt b/app/code/Magento/Multishipping/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE_AFL.txt
rename to app/code/Magento/Multishipping/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Multishipping/Test/Mftf/README.md b/app/code/Magento/Multishipping/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8349d39c5522b
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Multishipping Functional Tests
+
+The Functional Test Module for **Magento Multishipping** module.
diff --git a/app/code/Magento/Multishipping/Test/Mftf/composer.json b/app/code/Magento/Multishipping/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..344b2b1ef6525
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/functional-test-module-multishipping",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/LICENSE.txt b/app/code/Magento/MysqlMq/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/LICENSE.txt
rename to app/code/Magento/MysqlMq/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/LICENSE_AFL.txt b/app/code/Magento/MysqlMq/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/LICENSE_AFL.txt
rename to app/code/Magento/MysqlMq/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/MysqlMq/Test/Mftf/README.md b/app/code/Magento/MysqlMq/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ddedc2d14946d
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Mysql Mq Functional Tests
+
+The Functional Test Module for **Magento Mysql Mq** module.
diff --git a/app/code/Magento/MysqlMq/Test/Mftf/composer.json b/app/code/Magento/MysqlMq/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..0aa70a28428e4
--- /dev/null
+++ b/app/code/Magento/MysqlMq/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-mysql-mq",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/magento-composer-installer": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/LICENSE.txt b/app/code/Magento/NewRelicReporting/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/LICENSE.txt
rename to app/code/Magento/NewRelicReporting/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/LICENSE_AFL.txt b/app/code/Magento/NewRelicReporting/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/LICENSE_AFL.txt
rename to app/code/Magento/NewRelicReporting/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/NewRelicReporting/Test/Mftf/README.md b/app/code/Magento/NewRelicReporting/Test/Mftf/README.md
new file mode 100644
index 0000000000000..911d92102a572
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# New Relic Reporting Functional Tests
+
+The Functional Test Module for **Magento New Relic Reporting** module.
diff --git a/app/code/Magento/NewRelicReporting/Test/Mftf/composer.json b/app/code/Magento/NewRelicReporting/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..287475d097084
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Test/Mftf/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "magento/functional-test-module-new-relic-reporting",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/magento-composer-installer": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-configurable-product": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Data/NewsletterTemplateData.xml b/app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Data/NewsletterTemplateData.xml
rename to app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml
index 5b889728d9d1b..9719a892aa702 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Data/NewsletterTemplateData.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultNewsletter" type="cms_page">
         <data key="name" unique="suffix">Test Newsletter Template</data>
         <data key="subject">Test Newsletter Subject</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE.txt b/app/code/Magento/Newsletter/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE.txt
rename to app/code/Magento/Newsletter/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE_AFL.txt b/app/code/Magento/Newsletter/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE_AFL.txt
rename to app/code/Magento/Newsletter/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Page/NewsletterTemplatePage.xml b/app/code/Magento/Newsletter/Test/Mftf/Page/NewsletterTemplatePage.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Page/NewsletterTemplatePage.xml
rename to app/code/Magento/Newsletter/Test/Mftf/Page/NewsletterTemplatePage.xml
index 90c8ed93d2df2..b27bc5eee9f4d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Page/NewsletterTemplatePage.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Page/NewsletterTemplatePage.xml
@@ -6,7 +6,7 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="NewsletterTemplateForm" url="/newsletter/template/new/" area="admin" module="Magento_Cms">
         <section name="StorefrontNewsletterSection"/>
         <section name="StorefrontNewsletterSection"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/README.md b/app/code/Magento/Newsletter/Test/Mftf/README.md
new file mode 100644
index 0000000000000..266c5c5723f63
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Newsletter Functional Tests
+
+The Functional Test Module for **Magento Newsletter** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/NewsletterTemplateSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/NewsletterTemplateSection.xml
rename to app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml
index e3be7570f87d4..ef897ef6421bb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/NewsletterTemplateSection.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="BasicFieldNewsletterSection">
         <element name="templateName" type="input" selector="#code"/>
         <element name="templateSubject" type="input" selector="#subject"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/StorefrontNewsletterSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterSection.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/StorefrontNewsletterSection.xml
rename to app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterSection.xml
index 324b49997129b..01d3a36bf29c5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Section/StorefrontNewsletterSection.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontNewsletterSection">
         <element name="mediaDescription" type="text" selector="body>p>img" />
         <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
rename to app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
index 118d774ec6afc..f397b84dfaeb1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddImageToWYSIWYGNewsletterTest">
         <annotations>
             <features value="Newsletter"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml
rename to app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml
index 2ad2709c8fb8e..353d33439f079 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddVariableToWYSIWYGNewsletterTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddVariableToWYSIWYGNewsletterTest">
         <annotations>
             <features value="Newsletter"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml
rename to app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml
index bfa8fc40eeb20..a447acc1b0fca 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddWidgetToWYSIWYGNewsletterTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminAddWidgetToWYSIWYGNewsletterTest">
         <annotations>
             <features value="Newsletter"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml
rename to app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml
index b7b9e21adde7f..69ea5677a09e8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest">
         <annotations>
             <features value="Newsletter"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/composer.json b/app/code/Magento/Newsletter/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..2a2ab444dd08a
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/functional-test-module-newsletter",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-cms": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-email": "100.0.0-dev",
+        "magento/functional-test-module-require-js": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-widget": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/LICENSE.txt b/app/code/Magento/OfflinePayments/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/LICENSE.txt
rename to app/code/Magento/OfflinePayments/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/LICENSE_AFL.txt b/app/code/Magento/OfflinePayments/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/LICENSE_AFL.txt
rename to app/code/Magento/OfflinePayments/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/OfflinePayments/Test/Mftf/README.md b/app/code/Magento/OfflinePayments/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f12b3518c5672
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Offline Payments Functional Tests
+
+The Functional Test Module for **Magento Offline Payments** module.
diff --git a/app/code/Magento/OfflinePayments/Test/Mftf/composer.json b/app/code/Magento/OfflinePayments/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..7ce98340d75ee
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-offline-payments",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/LICENSE.txt b/app/code/Magento/OfflineShipping/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/LICENSE.txt
rename to app/code/Magento/OfflineShipping/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/LICENSE_AFL.txt b/app/code/Magento/OfflineShipping/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/LICENSE_AFL.txt
rename to app/code/Magento/OfflineShipping/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/OfflineShipping/Test/Mftf/README.md b/app/code/Magento/OfflineShipping/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3928af293d336
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Offline Shipping Functional Tests
+
+The Functional Test Module for **Magento Offline Shipping** module.
diff --git a/app/code/Magento/OfflineShipping/Test/Mftf/composer.json b/app/code/Magento/OfflineShipping/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..acca01f787402
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/Test/Mftf/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "magento/functional-test-module-offline-shipping",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-sales-rule": "100.0.0-dev",
+        "magento/functional-test-module-shipping": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-offline-shipping-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/ActionGroup/ClearCacheActionGroup.xml b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearCacheActionGroup.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/ActionGroup/ClearCacheActionGroup.xml
rename to app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearCacheActionGroup.xml
index f8d0cfb93f956..cf4bd4ff43c8e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/ActionGroup/ClearCacheActionGroup.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearCacheActionGroup.xml
@@ -7,7 +7,7 @@
         -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
 <actionGroup name="ClearCacheActionGroup">
     <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="goToNewCustomVarialePage" />
     <waitForPageLoad stepKey="waitForPageLoad"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/ActionGroup/ClearPageCacheActionGroup.xml b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearPageCacheActionGroup.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/ActionGroup/ClearPageCacheActionGroup.xml
rename to app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearPageCacheActionGroup.xml
index f09ca7f1fe025..0293b1e10b8ce 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/ActionGroup/ClearPageCacheActionGroup.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearPageCacheActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ClearPageCacheActionGroup">
         <amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="goToCacheManagementPage" />
         <waitForPageLoad stepKey="waitForPageLoad"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/LICENSE.txt b/app/code/Magento/PageCache/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/LICENSE.txt
rename to app/code/Magento/PageCache/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/LICENSE_AFL.txt b/app/code/Magento/PageCache/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/LICENSE_AFL.txt
rename to app/code/Magento/PageCache/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/PageCache/Test/Mftf/README.md b/app/code/Magento/PageCache/Test/Mftf/README.md
new file mode 100644
index 0000000000000..01c6ae4e4f483
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Page Cache Functional Tests
+
+The Functional Test Module for **Magento Page Cache** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/Section/AdminCacheManagementSection.xml b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/Section/AdminCacheManagementSection.xml
rename to app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
index d5d1e7bf65cb8..c91f021b5719b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/Section/AdminCacheManagementSection.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCacheManagementSection">
         <element name="FlushMagentoCache" type="button" selector="#flush_magento"/>
         <element name="actionDropDown" type="multiselect" selector="//*[@id='cache_grid_massaction-select']//option[contains(., 'Action')]" timeout="30"/>
diff --git a/app/code/Magento/PageCache/Test/Mftf/composer.json b/app/code/Magento/PageCache/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..3bfe8f15ef64e
--- /dev/null
+++ b/app/code/Magento/PageCache/Test/Mftf/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/functional-test-module-page-cache",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Data/PaymentMethodData.xml b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
similarity index 62%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Data/PaymentMethodData.xml
rename to app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
index 5b14d8b5e3f58..feaff74a3a985 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Data/PaymentMethodData.xml
+++ b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="PaymentMethodCheckMoneyOrder" type="payment_method">
         <data key="method">checkmo</data>
     </entity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/LICENSE.txt b/app/code/Magento/Payment/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/LICENSE.txt
rename to app/code/Magento/Payment/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/LICENSE_AFL.txt b/app/code/Magento/Payment/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/LICENSE_AFL.txt
rename to app/code/Magento/Payment/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Metadata/payment_method-meta.xml b/app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml
similarity index 63%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Metadata/payment_method-meta.xml
rename to app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml
index a091800bac070..eb5f272e25e25 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/Metadata/payment_method-meta.xml
+++ b/app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreatePaymentMethod" dataType="payment_method" type="create">
         <field key="method">string</field>
     </operation>
diff --git a/app/code/Magento/Payment/Test/Mftf/README.md b/app/code/Magento/Payment/Test/Mftf/README.md
new file mode 100644
index 0000000000000..fc489cbb253a0
--- /dev/null
+++ b/app/code/Magento/Payment/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Payment Functional Tests
+
+The Functional Test Module for **Magento Payment** module.
diff --git a/app/code/Magento/Payment/Test/Mftf/composer.json b/app/code/Magento/Payment/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..7311dae6fb074
--- /dev/null
+++ b/app/code/Magento/Payment/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-payment",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Data/PaypalData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Data/PaypalData.xml
rename to app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
index e60bc4f43b431..4cb6173a0273e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Data/PaypalData.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="SamplePaypalConfig" type="paypal_config_state">
         <requiredEntity type="business_account">SampleBusinessAccount</requiredEntity>
         <requiredEntity type="api_username">SampleApiUsername</requiredEntity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/LICENSE.txt b/app/code/Magento/Paypal/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/LICENSE.txt
rename to app/code/Magento/Paypal/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/LICENSE_AFL.txt b/app/code/Magento/Paypal/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/LICENSE_AFL.txt
rename to app/code/Magento/Paypal/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Metadata/paypal_config-meta.xml b/app/code/Magento/Paypal/Test/Mftf/Metadata/paypal_config-meta.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Metadata/paypal_config-meta.xml
rename to app/code/Magento/Paypal/Test/Mftf/Metadata/paypal_config-meta.xml
index bd93be7bdb464..37009297ddb30 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Metadata/paypal_config-meta.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Metadata/paypal_config-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreatePaypalConfigState" dataType="paypal_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
         <object key="groups" dataType="paypal_config_state">
             <object key="paypal_alternative_payment_methods" dataType="paypal_config_state">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Page/AdminConfigPaymentMethodsPage.xml b/app/code/Magento/Paypal/Test/Mftf/Page/AdminConfigPaymentMethodsPage.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Page/AdminConfigPaymentMethodsPage.xml
rename to app/code/Magento/Paypal/Test/Mftf/Page/AdminConfigPaymentMethodsPage.xml
index 9fa1a71e3441b..111e0d8b01a93 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Page/AdminConfigPaymentMethodsPage.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Page/AdminConfigPaymentMethodsPage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminConfigPaymentMethodsPage" url="admin/system_config/edit/section/payment/" area="admin" module="Magento_Config">
         <section name="OtherPaymentsConfigSection"/>
     </page>
diff --git a/app/code/Magento/Paypal/Test/Mftf/README.md b/app/code/Magento/Paypal/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8059d5d010526
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Paypal Functional Tests
+
+The Functional Test Module for **Magento Paypal** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Section/OtherPaymentsConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPaymentsConfigSection.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Section/OtherPaymentsConfigSection.xml
rename to app/code/Magento/Paypal/Test/Mftf/Section/OtherPaymentsConfigSection.xml
index 024c1317dba2f..ec4f4f4ae09e8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Section/OtherPaymentsConfigSection.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/OtherPaymentsConfigSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="OtherPaymentsConfigSection">
         <element name="expandedTab" type="button" selector="#payment_us_other_payment_methods-head.open"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Test/AdminConfigPaymentsSectionState.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
similarity index 82%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Test/AdminConfigPaymentsSectionState.xml
rename to app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
index 90c8dd5896198..283bc32412646 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/Test/AdminConfigPaymentsSectionState.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminConfigPaymentsSectionState">
         <annotations>
             <description value="Other Payment Methods section in Admin expanded by default"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/composer.json b/app/code/Magento/Paypal/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..4822c694580ef
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/composer.json
@@ -0,0 +1,34 @@
+{
+    "name": "magento/functional-test-module-paypal",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-instant-purchase": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-vault": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-checkout-agreements": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/Data/PersistentData.xml b/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/Data/PersistentData.xml
rename to app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml
index 4ba2e1ae73824..a23d1169b6865 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/Data/PersistentData.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Data/PersistentData.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="PersistentConfigDefault" type="persistent_config_state">
         <requiredEntity type="persistent_options_enabled">persistentDefaultState</requiredEntity>
     </entity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/LICENSE.txt b/app/code/Magento/Persistent/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/LICENSE.txt
rename to app/code/Magento/Persistent/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/LICENSE_AFL.txt b/app/code/Magento/Persistent/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/LICENSE_AFL.txt
rename to app/code/Magento/Persistent/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/Metadata/persistent_config-meta.xml b/app/code/Magento/Persistent/Test/Mftf/Metadata/persistent_config-meta.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/Metadata/persistent_config-meta.xml
rename to app/code/Magento/Persistent/Test/Mftf/Metadata/persistent_config-meta.xml
index 69a835aa703eb..42aae658b2e27 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/Metadata/persistent_config-meta.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Metadata/persistent_config-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreatePersistentConfigState" dataType="persistent_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/persistent/" method="POST">
         <object key="groups" dataType="persistent_config_state">
             <object key="options" dataType="persistent_config_state">
diff --git a/app/code/Magento/Persistent/Test/Mftf/README.md b/app/code/Magento/Persistent/Test/Mftf/README.md
new file mode 100644
index 0000000000000..14b4ba423ba0b
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Persistent Functional Tests
+
+The Functional Test Module for **Magento Persistent** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/Test/GuestCheckoutWithEnabledPersistentTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/Test/GuestCheckoutWithEnabledPersistentTest.xml
rename to app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml
index f7f76da7d3895..49d07992694d4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/Test/GuestCheckoutWithEnabledPersistentTest.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="GuestCheckoutWithEnabledPersistentTest">
         <annotations>
             <features value="Persistent"/>
diff --git a/app/code/Magento/Persistent/Test/Mftf/composer.json b/app/code/Magento/Persistent/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..0ea42b2755a0d
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-persistent",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-cron": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-page-cache": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/LICENSE.txt b/app/code/Magento/ProductAlert/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/LICENSE.txt
rename to app/code/Magento/ProductAlert/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/LICENSE_AFL.txt b/app/code/Magento/ProductAlert/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/LICENSE_AFL.txt
rename to app/code/Magento/ProductAlert/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ProductAlert/Test/Mftf/README.md b/app/code/Magento/ProductAlert/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c842458d761a1
--- /dev/null
+++ b/app/code/Magento/ProductAlert/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Product Alert Functional Tests
+
+The Functional Test Module for **Magento Product Alert** module.
diff --git a/app/code/Magento/ProductAlert/Test/Mftf/composer.json b/app/code/Magento/ProductAlert/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..37fda5965a0f8
--- /dev/null
+++ b/app/code/Magento/ProductAlert/Test/Mftf/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "magento/functional-test-module-product-alert",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/AdminProductVideoActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/AdminProductVideoActionGroup.xml
rename to app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
index 9fe81d56efa84..f28a9f9359def 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/AdminProductVideoActionGroup.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Add video in Admin Product page -->
     <actionGroup name="addProductVideo">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/StorefrontProductVideoActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/StorefrontProductVideoActionGroup.xml
rename to app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml
index 3aba592dee0b0..1f7750ab1f2cf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/ActionGroup/StorefrontProductVideoActionGroup.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/StorefrontProductVideoActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Assert product video in Storefront Product page -->
     <actionGroup name="assertProductVideoStorefrontProductPage">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoConfigData.xml b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoConfigData.xml
rename to app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml
index 2873febbe1e97..b21ac404711f7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoConfigData.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoConfigData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <!-- mftf test youtube api key configuration -->
     <entity name="ProductVideoYoutubeApiKeyConfig" type="product_video_config">
         <requiredEntity type="youtube_api_key_config">YouTubeApiKey</requiredEntity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoData.xml b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoData.xml
rename to app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml
index 05ecb1a69444a..93d3f93ff429f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Data/ProductVideoData.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="mftfTestProductVideo" type="product_video">
         <data key="videoUrl">https://youtu.be/bpOSxM0rNPM</data>
         <data key="videoTitle">Arctic Monkeys - Do I Wanna Know? (Official Video)</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/LICENSE.txt b/app/code/Magento/ProductVideo/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/LICENSE.txt
rename to app/code/Magento/ProductVideo/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/LICENSE_AFL.txt b/app/code/Magento/ProductVideo/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/LICENSE_AFL.txt
rename to app/code/Magento/ProductVideo/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Metadata/product_video_config-meta.xml b/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Metadata/product_video_config-meta.xml
rename to app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml
index be54d9038d0d1..07d91bc0a1e84 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Metadata/product_video_config-meta.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Metadata/product_video_config-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateProductVideoYouTubeApiKeyConfig" dataType="product_video_config" type="create" auth="adminFormKey" url="admin/system_config/save/section/catalog/" method="POST">
         <object key="groups" dataType="product_video_config">
             <object key="product_video" dataType="product_video_config">
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/README.md b/app/code/Magento/ProductVideo/Test/Mftf/README.md
new file mode 100644
index 0000000000000..b2243ad32074c
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Product Video Functional Tests
+
+The Functional Test Module for **Magento Product Video** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductImagesSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductImagesSection.xml
rename to app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml
index 66a93a6ec4b36..b232d24c51ee1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductImagesSection.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductImagesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductImagesSection">
         <element name="addVideoButton" type="button" selector="#add_video_button" timeout="60"/>
         <element name="removeVideoButton" type="button" selector="//*[@id='media_gallery_content']//button[@class='action-remove']" timeout="60"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductNewVideoSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductNewVideoSection.xml
rename to app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
index 8f55468a12748..89e6fd37b171b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/AdminProductNewVideoSection.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductNewVideoSection">
         <element name="saveButton" type="button" selector=".action-primary.video-create-button" timeout="30"/>
         <element name="saveButtonDisabled" type="text" selector="//button[@class='action-primary video-create-button' and @disabled='disabled']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/StorefrontProductInfoMainSection.xml
rename to app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 33d9cc8d0a03f..03e1d91df4d3e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoMainSection">
         <element name="productVideo" type="text" selector="//*[@class='product-video' and @data-type='{{videoType}}']" parameterized="true"/>
     </section>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/composer.json b/app/code/Magento/ProductVideo/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..a2f1223db010d
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/functional-test-module-product-video",
+    "description": "Add Video to Products",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/magento-composer-installer": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/CartItemData.xml b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/CartItemData.xml
rename to app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
index c1ffe00468abe..d4032b5f1ac56 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/CartItemData.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="SimpleCartItem" type="CartItem">
         <data key="qty">1</data>
         <var key="quote_id" entityKey="return" entityType="GuestCart"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/GuestCartData.xml b/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml
similarity index 82%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/GuestCartData.xml
rename to app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml
index bb65c1ade2e3f..062c4ebbad333 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Data/GuestCartData.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Data/GuestCartData.xml
@@ -8,7 +8,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
 
     <entity name="GuestCart" type="GuestCart">
     </entity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/LICENSE.txt b/app/code/Magento/Quote/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/LICENSE.txt
rename to app/code/Magento/Quote/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/LICENSE_AFL.txt b/app/code/Magento/Quote/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/LICENSE_AFL.txt
rename to app/code/Magento/Quote/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/billing_address-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/billing_address-meta.xml
rename to app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml
index 488f8ba49e28e..a21c4a30e8077 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/billing_address-meta.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/billing_address-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateBillingAddress" dataType="billing_address" type="create">
         <field key="city">string</field>
         <field key="region">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest_cart-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/guest_cart-meta.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest_cart-meta.xml
rename to app/code/Magento/Quote/Test/Mftf/Metadata/guest_cart-meta.xml
index 29d6266342fee..e08a30407889f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/guest_cart-meta.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/guest_cart-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateGuestCart" dataType="GuestCart" type="create" auth="anonymous" url="/V1/guest-carts" method="POST">
         <contentType>application/json</contentType>
     </operation>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/shipping_address-meta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/shipping_address-meta.xml
rename to app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml
index e75f49537dad5..537f6c2a2f87d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/Metadata/shipping_address-meta.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/shipping_address-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateShippingAddress" dataType="shipping_address" type="create">
         <field key="city">string</field>
         <field key="region">string</field>
diff --git a/app/code/Magento/Quote/Test/Mftf/README.md b/app/code/Magento/Quote/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f1021b8435cba
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Quote Functional Tests
+
+The Functional Test Module for **Magento Quote** module.
diff --git a/app/code/Magento/Quote/Test/Mftf/composer.json b/app/code/Magento/Quote/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..62932a84f3059
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Mftf/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "magento/functional-test-module-quote",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-authorization": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-sales-sequence": "100.0.0-dev",
+        "magento/functional-test-module-shipping": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-webapi": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/LICENSE.txt b/app/code/Magento/QuoteAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/LICENSE.txt
rename to app/code/Magento/QuoteAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/LICENSE_AFL.txt b/app/code/Magento/QuoteAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/LICENSE_AFL.txt
rename to app/code/Magento/QuoteAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/QuoteAnalytics/Test/Mftf/README.md b/app/code/Magento/QuoteAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..617b175d7ed07
--- /dev/null
+++ b/app/code/Magento/QuoteAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Quote Analytics Functional Tests
+
+The Functional Test Module for **Magento Quote Analytics** module.
diff --git a/app/code/Magento/QuoteAnalytics/Test/Mftf/composer.json b/app/code/Magento/QuoteAnalytics/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..4f0f8f2c07344
--- /dev/null
+++ b/app/code/Magento/QuoteAnalytics/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-quote-analytics",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-quote": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/LICENSE.txt b/app/code/Magento/ReleaseNotification/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/LICENSE.txt
rename to app/code/Magento/ReleaseNotification/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/LICENSE_AFL.txt b/app/code/Magento/ReleaseNotification/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/LICENSE_AFL.txt
rename to app/code/Magento/ReleaseNotification/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ReleaseNotification/Test/Mftf/README.md b/app/code/Magento/ReleaseNotification/Test/Mftf/README.md
new file mode 100644
index 0000000000000..a8c47e35e0c85
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Release Notification Functional Tests
+
+The Functional Test Module for **Magento Release Notification** module.
diff --git a/app/code/Magento/ReleaseNotification/Test/Mftf/composer.json b/app/code/Magento/ReleaseNotification/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..9499e710aaed2
--- /dev/null
+++ b/app/code/Magento/ReleaseNotification/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-release-notification",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/functional-test-module-user": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/LICENSE.txt b/app/code/Magento/Reports/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/LICENSE.txt
rename to app/code/Magento/Reports/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/LICENSE_AFL.txt b/app/code/Magento/Reports/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/Reports/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Reports/Test/Mftf/README.md b/app/code/Magento/Reports/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3617914a36783
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Reports Functional Tests
+
+The Functional Test Module for **Magento Reports** module.
diff --git a/app/code/Magento/Reports/Test/Mftf/composer.json b/app/code/Magento/Reports/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..6801ad5adaf2e
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/composer.json
@@ -0,0 +1,32 @@
+{
+    "name": "magento/functional-test-module-reports",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-cms": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-downloadable": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-review": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-sales-rule": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-widget": "100.0.0-dev",
+        "magento/functional-test-module-wishlist": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/LICENSE.txt b/app/code/Magento/RequireJs/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/LICENSE.txt
rename to app/code/Magento/RequireJs/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/LICENSE_AFL.txt b/app/code/Magento/RequireJs/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/LICENSE_AFL.txt
rename to app/code/Magento/RequireJs/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/RequireJs/Test/Mftf/README.md b/app/code/Magento/RequireJs/Test/Mftf/README.md
new file mode 100644
index 0000000000000..152b706f7be1e
--- /dev/null
+++ b/app/code/Magento/RequireJs/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Require Js Functional Tests
+
+The Functional Test Module for **Magento Require Js** module.
diff --git a/app/code/Magento/RequireJs/Test/Mftf/composer.json b/app/code/Magento/RequireJs/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..57bd4809b4140
--- /dev/null
+++ b/app/code/Magento/RequireJs/Test/Mftf/composer.json
@@ -0,0 +1,16 @@
+{
+    "name": "magento/functional-test-module-require-js",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/LICENSE.txt b/app/code/Magento/Review/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/LICENSE.txt
rename to app/code/Magento/Review/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/LICENSE_AFL.txt b/app/code/Magento/Review/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/LICENSE_AFL.txt
rename to app/code/Magento/Review/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Review/Test/Mftf/README.md b/app/code/Magento/Review/Test/Mftf/README.md
new file mode 100644
index 0000000000000..86af37286a7d6
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Review Functional Tests
+
+The Functional Test Module for **Magento Review** module.
diff --git a/app/code/Magento/Review/Test/Mftf/composer.json b/app/code/Magento/Review/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..ae12d545ec244
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/composer.json
@@ -0,0 +1,28 @@
+{
+    "name": "magento/functional-test-module-review",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-newsletter": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-cookie": "100.0.0-dev",
+        "magento/functional-test-module-review-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/LICENSE.txt b/app/code/Magento/ReviewAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/LICENSE.txt
rename to app/code/Magento/ReviewAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/LICENSE_AFL.txt b/app/code/Magento/ReviewAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/LICENSE_AFL.txt
rename to app/code/Magento/ReviewAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/ReviewAnalytics/Test/Mftf/README.md b/app/code/Magento/ReviewAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9175fe01002bc
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Review Analytics Functional Tests
+
+The Functional Test Module for **Magento Review Analytics** module.
diff --git a/app/code/Magento/ReviewAnalytics/Test/Mftf/composer.json b/app/code/Magento/ReviewAnalytics/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..0164913753cb4
--- /dev/null
+++ b/app/code/Magento/ReviewAnalytics/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-review-analytics",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-review": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/LICENSE.txt b/app/code/Magento/Robots/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/LICENSE.txt
rename to app/code/Magento/Robots/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/LICENSE_AFL.txt b/app/code/Magento/Robots/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/Robots/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Robots/Test/Mftf/README.md b/app/code/Magento/Robots/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e10f7c3e78419
--- /dev/null
+++ b/app/code/Magento/Robots/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Robots Functional Tests
+
+The Functional Test Module for **Magento Robots** module.
diff --git a/app/code/Magento/Robots/Test/Mftf/composer.json b/app/code/Magento/Robots/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..d3f2447e7970a
--- /dev/null
+++ b/app/code/Magento/Robots/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-robots",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-theme": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/LICENSE.txt b/app/code/Magento/Rss/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/LICENSE.txt
rename to app/code/Magento/Rss/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/LICENSE_AFL.txt b/app/code/Magento/Rss/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/LICENSE_AFL.txt
rename to app/code/Magento/Rss/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Rss/Test/Mftf/README.md b/app/code/Magento/Rss/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f0dfa5b1df52f
--- /dev/null
+++ b/app/code/Magento/Rss/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Rss Functional Tests
+
+The Functional Test Module for **Magento Rss** module.
diff --git a/app/code/Magento/Rss/Test/Mftf/composer.json b/app/code/Magento/Rss/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..cf3a9dae8a054
--- /dev/null
+++ b/app/code/Magento/Rss/Test/Mftf/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/functional-test-module-rss",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/LICENSE.txt b/app/code/Magento/Rule/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/LICENSE.txt
rename to app/code/Magento/Rule/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/LICENSE_AFL.txt b/app/code/Magento/Rule/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/LICENSE_AFL.txt
rename to app/code/Magento/Rule/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Rule/Test/Mftf/README.md b/app/code/Magento/Rule/Test/Mftf/README.md
new file mode 100644
index 0000000000000..46d592f4ab950
--- /dev/null
+++ b/app/code/Magento/Rule/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Rule Functional Tests
+
+The Functional Test Module for **Magento Rule** module.
diff --git a/app/code/Magento/Rule/Test/Mftf/composer.json b/app/code/Magento/Rule/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..827d8603fdb99
--- /dev/null
+++ b/app/code/Magento/Rule/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-rule",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminCreditMemoActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminCreditMemoActionGroup.xml
rename to app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
index e83f061f56268..2a9ef0c948392 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminCreditMemoActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Check customer information is correct in credit memo-->
     <actionGroup name="verifyBasicCreditMemoInformation">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminInvoiceActionGroup.xml
rename to app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
index 29d7a2773aad6..f17d3462d06f3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminInvoiceActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Check customer information is correct in invoice-->
     <actionGroup name="verifyBasicInvoiceInformation">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
similarity index 98%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml
rename to app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index f041ac97e5cac..25dfdce165aaa 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Navigate to create order page (New Order -> Create New Customer)-->
     <actionGroup name="navigateToNewOrderPageNewCustomer">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderGridActionGroup.xml
rename to app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
index 696cc898a2bc8..7dcb89fdc1628 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/ActionGroup/AdminOrderGridActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Filter order grid by order id field-->
     <actionGroup name="filterOrderGridById">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/AddressData.xml b/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/AddressData.xml
rename to app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
index 4c3bd6d7f7ed8..800bbfca2f869 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/AddressData.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ShippingAddressTX" type="shipping_address">
         <data key="firstname">Joe</data>
         <data key="lastname">Buyer</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/ConstData.xml b/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml
similarity index 64%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/ConstData.xml
rename to app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml
index a91f31a88c235..f6855ed09c263 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/ConstData.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Data/ConstData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="Const" type="constant">
         <data key="one">1</data>
         <data key="two">2</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/OrderData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/OrderData.xml
rename to app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
index 39772e4c5da10..566fb7d44528e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Data/OrderData.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <!--Data for order created through UI with simple and configurable order-->
     <entity name="AdminOrderSimpleConfigurableProduct" type="order">
         <data key="subtotal">246.00</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/LICENSE.txt b/app/code/Magento/Sales/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/LICENSE.txt
rename to app/code/Magento/Sales/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/LICENSE_AFL.txt b/app/code/Magento/Sales/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/LICENSE_AFL.txt
rename to app/code/Magento/Sales/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminCreditMemoNewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoNewPage.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminCreditMemoNewPage.xml
rename to app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoNewPage.xml
index 79312e75a6416..5a50c807628c6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminCreditMemoNewPage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminCreditMemoNewPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminCreditMemoNewPage" url="sales/order_creditmemo/new/order_id/" area="admin" module="Magento_Sales">
         <section name="AdminCreditMemoOrderInformationSection"/>
         <section name="AdminCreditMemoAddressInformationSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceDetailsPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceDetailsPage.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceDetailsPage.xml
rename to app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceDetailsPage.xml
index 9322a5779d232..a60e44247fe9c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceDetailsPage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceDetailsPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminInvoiceDetailsPage" url="sales/invoice/view/invoice_id/" area="admin" module="Magento_Sales">
         <section name="AdminInvoiceDetailsInformationSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceNewPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceNewPage.xml
rename to app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml
index 6c603f582738e..e782fe5194720 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoiceNewPage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoiceNewPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminInvoiceNewPage" url="sales/order_invoice/new/order_id/" area="admin" module="Magento_Sales">
         <section name="AdminInvoiceMainActionsSection"/>
         <section name="AdminInvoiceOrderInformationSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoicesPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoicesPage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoicesPage.xml
rename to app/code/Magento/Sales/Test/Mftf/Page/AdminInvoicesPage.xml
index d29844da5a8c1..7f7289b2e64fd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminInvoicesPage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminInvoicesPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminInvoicesPage" url="sales/invoice/" area="admin" module="Magento_Sales">
         <section name="AdminInvoicesGridSection"/>
         <section name="AdminInvoicesFiltersSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderCreatePage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderCreatePage.xml
rename to app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
index 4eba7f02302fd..49520261d857f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderCreatePage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminOrderCreatePage" url="sales/order_create/index" area="admin" module="Magento_Sales">
         <section name="AdminOrderFormActionSection"/>
         <section name="AdminOrderFormItemsSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml
rename to app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml
index df8f4ed63787c..690eade8b0c8f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrderDetailsPage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderDetailsPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminOrderDetailsPage" url="sales/order/view/order_id/" area="admin" module="Magento_Sales">
         <section name="AdminOrderDetailsMainActionsSection"/>
         <section name="AdminOrderDetailsOrderViewSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrdersPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrdersPage.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrdersPage.xml
rename to app/code/Magento/Sales/Test/Mftf/Page/AdminOrdersPage.xml
index b3620c1935a32..d4d5e78631885 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Page/AdminOrdersPage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrdersPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminOrdersPage" url="sales/order/" area="admin" module="Magento_Sales">
         <section name="AdminOrdersGridSection"/>
     </page>
diff --git a/app/code/Magento/Sales/Test/Mftf/README.md b/app/code/Magento/Sales/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8a515e2b6233b
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sales Functional Tests
+
+The Functional Test Module for **Magento Sales** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoAddressInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoAddressInformationSection.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoAddressInformationSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoAddressInformationSection.xml
index 68baf82796fe3..85e5faca3a48c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoAddressInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoAddressInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCreditMemoAddressInformationSection">
         <element name="billingAddress" type="text" selector=".order-billing-address address"/>
         <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoItemsSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
index 024a2c55bef1c..5e3e8fc6e22ec 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoItemsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoItemsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCreditMemoItemsSection">
         <element name="header" type="text" selector="#creditmemo_item_container span.title"/>
         <element name="itemName" type="text" selector=".order-creditmemo-tables tbody:nth-of-type({{row}}) .col-product .product-title" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoOrderInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoOrderInformationSection.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoOrderInformationSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoOrderInformationSection.xml
index 6ffaa51c2d4d3..b0be8c6cd6575 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoOrderInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoOrderInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCreditMemoOrderInformationSection">
         <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="60"/>
         <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoPaymentShippingSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoPaymentShippingSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoPaymentShippingSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoPaymentShippingSection.xml
index 1411ee23970a1..b307a5d1cf4bc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoPaymentShippingSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoPaymentShippingSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCreditMemoPaymentShippingSection">
         <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
         <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoTotalSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
index 529d86dc203a1..a49d06545df05 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminCreditMemoTotalSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCreditMemoTotalSection">
         <element name="subtotalRow" type="text" selector=".order-subtotal-table tbody > tr:nth-of-type({{row}}) td span.price" parameterized="true"/>
         <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td/span/span[contains(@class, 'price')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceAddressInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceAddressInformationSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml
index f8b0e3dd284a4..63712f24a5de8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceAddressInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceAddressInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminInvoiceAddressInformationSection">
         <element name="billingAddress" type="text" selector=".order-billing-address address"/>
         <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceDetailsInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceDetailsInformationSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceDetailsInformationSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceDetailsInformationSection.xml
index d45a0245c00b9..41b36310ebeb1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceDetailsInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceDetailsInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminInvoiceDetailsInformationSection">
         <element name="orderStatus" type="text" selector="#order_status"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceItemsSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
index da2a7e10ae1f8..56c165bada500 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceItemsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminInvoiceItemsSection">
         <element name="itemName" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .product-title" parameterized="true"/>
         <element name="itemSku" type="text" selector=".order-invoice-tables tbody:nth-of-type({{row}}) .product-sku-block" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceMainActionsSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
index dff6a0d84cafc..c1a9718b29b1c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceMainActionsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceMainActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminInvoiceMainActionsSection">
         <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceOrderInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderInformationSection.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceOrderInformationSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderInformationSection.xml
index ad1d3052158a5..198a087bffc45 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceOrderInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminInvoiceOrderInformationSection">
         <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="30"/>
         <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicePaymentShippingSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicePaymentShippingSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
index d3ca09c1811cb..3bb381047bb97 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicePaymentShippingSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminInvoicePaymentShippingSection">
         <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
         <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceTotalSection.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceTotalSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceTotalSection.xml
index 49b734320a7ea..db5b12f622b64 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoiceTotalSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceTotalSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminInvoiceTotalSection">
         <element name="subtotalRow" type="text" selector=".order-subtotal-table tbody > tr:nth-of-type({{row}}) td span.price" parameterized="true"/>
         <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td/span/span[contains(@class, 'price')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesFiltersSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesFiltersSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml
index 1fad379d23176..5b55dd3cc1aae 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesFiltersSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminInvoicesFiltersSection">
         <element name="orderNum" type="input" selector="input[name='order_increment_id']"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesGridSection.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesGridSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesGridSection.xml
index 3b7bbd6fd14e4..8d2d8750e5045 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminInvoicesGridSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesGridSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminInvoicesGridSection">
         <element name="spinner" type="button" selector=".spinner"/>
         <element name="filter" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderAddressInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderAddressInformationSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml
index 90887c13f526c..2900cb60391be 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderAddressInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderAddressInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderAddressInformationSection">
         <element name="billingAddress" type="text" selector=".order-billing-address address"/>
         <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCommentsTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCommentsTabSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml
index 18f10f5c8ba31..9a784049e081a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCommentsTabSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderCommentsTabSection">
         <element name="orderNotesList" type="text" selector="#Order_History .edit-order-comments .note-list"/>
         <element name="orderComments" type="text" selector="#Order_History .edit-order-comments-block"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCreditMemosTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCreditMemosTabSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml
index 98b34bda914a0..f4835cf02b704 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderCreditMemosTabSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderCreditMemosTabSection">
         <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_creditmemo']"/>
         <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_creditmemos_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInformationSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml
index 2ba11746694ad..39feba4694019 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderDetailsInformationSection">
         <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
         <element name="orderStatus" type="text" selector=".order-information table.order-information-table #order_status"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInvoicesSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInvoicesSection.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInvoicesSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInvoicesSection.xml
index 5831e07f41e6d..b6b32184841c4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsInvoicesSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInvoicesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderDetailsInvoicesSection">
         <element name="spinner" type="button" selector=".spinner"/>
         <element name="content" type="text" selector="#sales_order_view_tabs_order_invoices_content"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMainActionsSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
index 4c08980bf7dde..eac238584b030 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMainActionsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderDetailsMainActionsSection">
         <element name="back" type="button" selector="#back" timeout="30"/>
         <element name="cancel" type="button" selector="#order-view-cancel-button" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMessagesSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMessagesSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMessagesSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMessagesSection.xml
index 0311d5cf75c6d..31f78db11f90b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsMessagesSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMessagesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderDetailsMessagesSection">
         <element name="successMessage" type="text" selector="div.message-success"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsOrderViewSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsOrderViewSection.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsOrderViewSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsOrderViewSection.xml
index 1a83aa0eb6234..6623c68099fe7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderDetailsOrderViewSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsOrderViewSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderDetailsOrderViewSection">
         <element name="information" type="button" selector="#sales_order_view_tabs_order_info"/>
         <element name="invoices" type="button" selector="#sales_order_view_tabs_order_invoices"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml
index 0b03f089227b9..3c920bc6ba0e7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormAccountSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormAccountSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormAccountSection">
         <element name="group" type="select" selector="#group_id"/>
         <element name="email" type="input" selector="#email"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormActionSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormActionSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml
index 302e0badb4543..09b2012841b8b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormActionSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormActionSection">
         <element name="SubmitOrder" type="button" selector="#submit_order_top_button" timeout="30"/>
         <element name="Cancel" type="button" selector="#reset_order_top_button" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml
index d3348cf2a8e9e..b0f7eb21d4dd7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormBillingAddressSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormBillingAddressSection">
         <element name="NamePrefix" type="input" selector="#order-billing_address_prefix" timeout="30"/>
         <element name="FirstName" type="input" selector="#order-billing_address_firstname" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormConfigureProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormConfigureProductSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
index 1d1ff664eb7a3..87948c38e4328 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormConfigureProductSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormConfigureProductSection">
         <element name="optionSelect" type="select" selector="//div[@class='product-options']/div/div/select[../../label[text() = '{{option}}']]" parameterized="true"/>
         <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormItemsSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
index c3486e1af5a1c..86288ec7d7ec9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormItemsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormItemsSection">
         <element name="skuNumber" type="input" selector="#sku_{{row}}" parameterized="true"/>
         <element name="qty" type="input" selector="#sku_qty_{{row}}" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormPaymentSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormPaymentSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
index ff0d91a2b0d08..bb7c89dd39b6c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormPaymentSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormPaymentSection">
         <element name="header" type="text" selector="#order-methods span.title"/>
         <element name="getShippingMethods" type="text" selector="#order-shipping_method a.action-default" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormShippingAddressSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormShippingAddressSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
index c7fc616eac6f1..82ecb023198c7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormShippingAddressSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormShippingAddressSection">
         <element name="SameAsBilling" type="checkbox" selector="#order-shipping_same_as_billing"/>
         <element name="NamePrefix" type="input" selector="#order-shipping_address_prefix"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormTotalSection.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormTotalSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormTotalSection.xml
index d558ecb3dfb92..e44a97b678f89 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderFormTotalSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormTotalSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormTotalSection">
         <element name="subtotalRow" type="text" selector="#order-totals>table tr.row-totals:nth-of-type({{row}}) span.price" parameterized="true"/>
         <element name="total" type="text" selector="//tr[contains(@class,'row-totals')]/td[contains(text(), '{{total}}')]/following-sibling::td/span[contains(@class, 'price')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderInvoicesTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderInvoicesTabSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml
index 985c070933b48..e00ab7e66b99a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderInvoicesTabSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderInvoicesTabSection">
         <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_invoice']"/>
         <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_invoices_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderItemsOrderedSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
index 6a49d79db2010..9807d7364c7c6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderItemsOrderedSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderItemsOrderedSection">
         <element name="itemProductName" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-product .product-title" parameterized="true"/>
         <element name="itemProductSku" type="text" selector=".edit-order-table tr:nth-of-type({{row}}) .col-product .product-sku-block" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderPaymentInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderPaymentInformationSection.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderPaymentInformationSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderPaymentInformationSection.xml
index a750f2fa062d7..15b468d1dfa9b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderPaymentInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderPaymentInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderPaymentInformationSection">
         <element name="paymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
         <element name="paymentCurrency" type="text" selector=".order-payment-method .order-payment-currency"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShipmentsTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShipmentsTabSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml
index 9ed9d852b4bea..65dbf01aad2e0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShipmentsTabSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderShipmentsTabSection">
         <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_shipment']"/>
         <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_shipments_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShippingInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShippingInformationSection.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShippingInformationSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShippingInformationSection.xml
index 0c1bd47595931..f29e8a2a7f970 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderShippingInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShippingInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderShippingInformationSection">
         <element name="shippingMethod" type="text" selector=".order-shipping-method .admin__page-section-item-content"/>
         <element name="shippingPrice" type="text" selector=".order-shipping-method .admin__page-section-item-content .price"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderStoreScopeTreeSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderStoreScopeTreeSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
index 31617e2ff9dde..8f31dd1b8e96c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderStoreScopeTreeSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderStoreScopeTreeSection">
         <element name="storeTree" type="text" selector="div.tree-store-scope"/>
         <element name="storeOption" type="radio" selector="//div[contains(@class, 'tree-store-scope')]//label[contains(text(), '{{name}}')]/preceding-sibling::input" parameterized="true" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml
similarity index 82%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderTotalSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml
index 2434bfaea2638..5d60886a96a51 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrderTotalSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrderTotalSection">
         <element name="subTotal" type="text" selector=".order-subtotal-table tbody tr.col-0>td span.price"/>
         <element name="grandTotal" type="text" selector=".order-subtotal-table tfoot tr.col-0>td span.price"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrdersGridSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
index ccf477b1e523c..aa744787b0fef 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/AdminOrdersGridSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminOrdersGridSection">
         <element name="spinner" type="button" selector=".spinner"/>
         <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
index 763f1e20a8d0e..f54fbf4cf4d53 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="OrdersGridSection">
         <element name="spinner" type="button" selector=".spinner"/>
         <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceTest.xml
rename to app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
index 70bf457b11567..317a325693c65 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateInvoiceTest">
         <annotations>
             <features value="Sales"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
rename to app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
index 0f1c1d70652b0..23e4ae676b35b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminSubmitsOrderWithAndWithoutEmailTest">
         <annotations>
             <title value="Email is required to create an order from Admin Panel"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml
similarity index 99%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/EndToEndB2CAdminTest.xml
rename to app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index 2dbf2bdbe6e01..4dc3c7a6ae788 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CAdminTest">
         <before>
             <!--Create order via API-->
diff --git a/app/code/Magento/Sales/Test/Mftf/composer.json b/app/code/Magento/Sales/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..ac26bb1bf49f5
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/composer.json
@@ -0,0 +1,43 @@
+{
+    "name": "magento/functional-test-module-sales",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-authorization": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-bundle": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-gift-message": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-reports": "100.0.0-dev",
+        "magento/functional-test-module-sales-rule": "100.0.0-dev",
+        "magento/functional-test-module-sales-sequence": "100.0.0-dev",
+        "magento/functional-test-module-shipping": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-widget": "100.0.0-dev",
+        "magento/functional-test-module-wishlist": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-sales-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/LICENSE.txt b/app/code/Magento/SalesAnalytics/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/LICENSE.txt
rename to app/code/Magento/SalesAnalytics/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/LICENSE_AFL.txt b/app/code/Magento/SalesAnalytics/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/LICENSE_AFL.txt
rename to app/code/Magento/SalesAnalytics/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SalesAnalytics/Test/Mftf/README.md b/app/code/Magento/SalesAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..00e1b136c5c26
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sales Analytics Functional Tests
+
+The Functional Test Module for **Magento Sales Analytics** module.
diff --git a/app/code/Magento/SalesAnalytics/Test/Mftf/composer.json b/app/code/Magento/SalesAnalytics/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..7382a7dcc8e5a
--- /dev/null
+++ b/app/code/Magento/SalesAnalytics/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-sales-analytics",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-sales": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/LICENSE.txt b/app/code/Magento/SalesInventory/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/LICENSE.txt
rename to app/code/Magento/SalesInventory/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/LICENSE_AFL.txt b/app/code/Magento/SalesInventory/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/SalesInventory/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SalesInventory/Test/Mftf/README.md b/app/code/Magento/SalesInventory/Test/Mftf/README.md
new file mode 100644
index 0000000000000..5d52679cbb173
--- /dev/null
+++ b/app/code/Magento/SalesInventory/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sales Inventory Functional Tests
+
+The Functional Test Module for **Magento Sales Inventory** module.
diff --git a/app/code/Magento/SalesInventory/Test/Mftf/composer.json b/app/code/Magento/SalesInventory/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..7a72dfc649780
--- /dev/null
+++ b/app/code/Magento/SalesInventory/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-sales-inventory",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/AdminCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
similarity index 72%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/AdminCartPriceRuleActionGroup.xml
rename to app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
index 24d881ee6081d..997b3b4b9ff06 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/AdminCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="selectNotLoggedInCustomerGroup">
         <!-- This actionGroup was created to be merged from B2B because B2B has a very different form control here -->
         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/AdminSalesRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminSalesRuleActionGroup.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/AdminSalesRuleActionGroup.xml
rename to app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminSalesRuleActionGroup.xml
index 93bdf29a8ba14..4026c3d65cfaf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/AdminSalesRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminSalesRuleActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeleteCartPriceRuleByName">
         <arguments>
             <argument name="ruleName" type="string"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
rename to app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
index 06318f5080943..e8c520f1f985e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/ApplyCartRuleOnStorefrontActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ApplyCartRuleOnStorefrontActionGroup">
         <arguments>
             <argument name="Product" defaultValue="_defaultProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml
rename to app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
index 0027d9a71fff3..5d1cc877aa775 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/ActionGroup/StorefrontSalesRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Apply Sales Rule Coupon to the cart -->
     <actionGroup name="StorefrontApplyCouponActionGroup">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/QuoteData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/QuoteData.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/QuoteData.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Data/QuoteData.xml
index 389cda03235bc..7e929266b89ef 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/QuoteData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/QuoteData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <!-- @TODO: Get rid off this workaround and its usages after MQE-498 is implemented -->
     <entity name="E2EB2CQuoteWith10PercentDiscount" type="Quote">
         <data key="subtotal">480.00</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesCouponData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesCouponData.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
index 4d93ea208fc3a..917b4ca179b8a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesCouponData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ApiSalesRuleCoupon" type="SalesRuleCoupon">
         <data key="code" unique="suffix">salesCoupon</data>
         <data key="times_used">0</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleCouponData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleCouponData.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml
index b2e9f3d61abff..6cca73dff5724 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleCouponData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml
@@ -6,7 +6,7 @@
   */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="SimpleSalesRuleCoupon" type="SalesRuleCoupon">
         <var key="rule_id" entityKey="rule_id" entityType="SalesRule"/>
         <data key="code" unique="suffix">Code</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleData.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
index d89d3f44776e4..efd21405a7cc1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="ApiSalesRule" type="SalesRule">
         <data key="name" unique="suffix">salesRule</data>
         <data key="description">Sales Rule Descritpion</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleLabelData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleLabelData.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleLabelData.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleLabelData.xml
index 6798b34a7557a..f1916e81e0e52 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Data/SalesRuleLabelData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleLabelData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="SalesRuleLabelDefault" type="SalesRuleLabel">
         <data key="store_id">0</data>
         <data key="store_label" unique="suffix">Sales Rule (Default) </data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/LICENSE.txt b/app/code/Magento/SalesRule/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/LICENSE.txt
rename to app/code/Magento/SalesRule/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/LICENSE_AFL.txt b/app/code/Magento/SalesRule/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/LICENSE_AFL.txt
rename to app/code/Magento/SalesRule/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-condition-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-condition-meta.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-condition-meta.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-condition-meta.xml
index 82b3e3de28fea..bf4809a7d3f8d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-condition-meta.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-condition-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateSalesRuleCondition" dataType="SalesRuleCondition" type="create">
         <field key="condition_type" required="true">string</field>
         <array key="conditions" required="true">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-coupon-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-coupon-meta.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-coupon-meta.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-coupon-meta.xml
index 6b5e4a1a6cab6..03b87a96e6ce6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-coupon-meta.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-coupon-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateSalesRuleCoupon" dataType="SalesRuleCoupon" type="create" auth="adminOauth" url="/V1/coupons" method="POST">
         <contentType>application/json</contentType>
         <object key="coupon" dataType="SalesRuleCoupon">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-label-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-label-meta.xml
similarity index 78%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-label-meta.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-label-meta.xml
index 17429d38a3254..676cb7026c2fa 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-label-meta.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-label-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+            xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateSalesRuleLabel" dataType="SalesRuleLabel" type="create">
         <field key="store_id" required="true">integer</field>
         <field key="store_label" required="true">string</field>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-meta.xml b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-meta.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml
index f71431ff97dda..6e6a203a4e6c5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Metadata/sales_rule-meta.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Metadata/sales_rule-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateSalesRule" dataType="SalesRule" type="create" auth="adminOauth" url="/V1/salesRules" method="POST">
         <contentType>application/json</contentType>
         <object key="rule" dataType="SalesRule">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Page/AdminCartPriceRulesPage.xml b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesPage.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Page/AdminCartPriceRulesPage.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesPage.xml
index 66172f4ac146d..2c260540ae79f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Page/AdminCartPriceRulesPage.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRulesPage.xml
@@ -6,7 +6,7 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminCartPriceRulesPage" url="sales_rule/promo_quote/" area="admin" module="SalesRule">
         <section name="AdminCartPriceRulesSection"/>
         <section name="AdminCartPriceRulesFormSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Page/PriceRuleNewPage.xml b/app/code/Magento/SalesRule/Test/Mftf/Page/PriceRuleNewPage.xml
similarity index 53%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Page/PriceRuleNewPage.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Page/PriceRuleNewPage.xml
index c8475de4c61f7..4bedeb88effc8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Page/PriceRuleNewPage.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Page/PriceRuleNewPage.xml
@@ -4,7 +4,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<pages xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <page name="PriceRuleNewPage" url="sales_rule/promo_quote/new/" area="admin" module="Magento_SalesRule">
         <section name="PriceRuleConditionsSection"/>
     </page>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/README.md b/app/code/Magento/SalesRule/Test/Mftf/README.md
new file mode 100644
index 0000000000000..7b65abe671e29
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sales Rule Functional Tests
+
+The Functional Test Module for **Magento Sales Rule** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/AdminCartPriceRulesFormSection.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
index 3912a6ab31e8d..87408aac2c0c9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/AdminCartPriceRulesFormSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCartPriceRulesFormSection">
         <element name="save" type="button" selector="#save" timeout="30"/>
         <element name="saveAndContinue" type="button" selector="#save_and_continue" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/AdminCartPriceRulesSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/AdminCartPriceRulesSection.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
index 882f6cd2dcf9b..5fe5fc1e34687 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/AdminCartPriceRulesSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCartPriceRulesSection">
         <element name="addNewRuleButton" type="button" selector="#add" timeout="30"/>
         <element name="messages" type="text" selector=".messages"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/CheckoutCartSummarySection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/CheckoutCartSummarySection.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/CheckoutCartSummarySection.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Section/CheckoutCartSummarySection.xml
index 68dee0de52390..5327d53032d48 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/CheckoutCartSummarySection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutCartSummarySection">
         <element name="discountLabel" type="text" selector="//*[@id='cart-totals']//tr[.//th//span[contains(@class, 'discount coupon')]]"/>
         <element name="discountTotal" type="text" selector="//*[@id='cart-totals']//tr[.//th//span[contains(@class, 'discount coupon')]]//td//span//span[@class='price']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/DiscountSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/DiscountSection.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
index 853e8f75a217b..cc9ab6724528c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/DiscountSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="DiscountSection">
         <element name="DiscountTab" type="button" selector="//strong[text()='Apply Discount Code']"/>
         <element name="CouponInput" type="input" selector="#coupon_code"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml
index 93ed408ce7a0e..1b05ec838dc98 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/PriceRuleConditionsSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml
@@ -4,7 +4,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<sections xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <section name="PriceRuleConditionsSection">
         <element name="conditionsTab" type="text" selector="//div[@data-index='conditions']//span[contains(.,'Conditions')][1]"/>
         <element name="createNewRule" type="text" selector="span.rule-param.rule-param-new-child"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/StorefrontSalesRuleCartCouponSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontSalesRuleCartCouponSection.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/StorefrontSalesRuleCartCouponSection.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontSalesRuleCartCouponSection.xml
index 7c0b918864db3..39d85ae5fa69b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Section/StorefrontSalesRuleCartCouponSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontSalesRuleCartCouponSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontSalesRuleCartCouponSection">
         <element name="couponHeader" type="button" selector="//*[@id='block-discount-heading']"/>
         <element name="couponField" type="text" selector="//*[@id='coupon_code']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateBuyXGetYFreeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateBuyXGetYFreeTest.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml
index e8b1ebfa99be0..d21034bc9248f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateBuyXGetYFreeTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateBuyXGetYFreeTest">
         <annotations>
             <features value="SalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
index 29f7fedc33af5..a33a4b819b530 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateCartPriceRuleForCouponCodeTest">
         <annotations>
             <features value="SalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
index 15a2d8cedc99c..cf8879514f5a5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateCartPriceRuleForGeneratedCouponTest">
         <annotations>
             <features value="SalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountDiscountTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountDiscountTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountDiscountTest.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountDiscountTest.xml
index b9fbf38236c11..adf8b391a68bf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountDiscountTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountDiscountTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateFixedAmountDiscountTest">
         <annotations>
             <features value="SalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml
index 6c6a1ece40444..c482d25828397 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateFixedAmountWholeCartDiscountTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateFixedAmountWholeCartDiscountTest">
         <annotations>
             <features value="SalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreatePercentOfProductPriceTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreatePercentOfProductPriceTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreatePercentOfProductPriceTest.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreatePercentOfProductPriceTest.xml
index 3086a7855d647..2de7952cd1208 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/AdminCreatePercentOfProductPriceTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreatePercentOfProductPriceTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreatePercentOfProductPriceTest">
         <annotations>
             <features value="SalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CGuestUserTest.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 6e1ba5ad1649b..05ea5a32574c8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CGuestUserTest">
         <before>
             <createData entity="ApiSalesRule" stepKey="createSalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CLoggedInUserTest.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index fcb8028220cb1..c0ef70dbd048a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CLoggedInUserTest">
         <before>
             <createData entity="ApiSalesRule" stepKey="createSalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/PriceRuleCategoryNestingTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/PriceRuleCategoryNestingTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/PriceRuleCategoryNestingTest.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/PriceRuleCategoryNestingTest.xml
index 9d47a5e823e83..a46fc19a51cc8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/PriceRuleCategoryNestingTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/PriceRuleCategoryNestingTest.xml
@@ -4,7 +4,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<tests xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<tests xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <test name="PriceRuleCategoryNestingTest">
         <annotations>
             <description value="Category nesting level must be the same as were created in categories."/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleCountry.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleCountry.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml
index a6a0d669f3435..508b16721b2df 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleCountry.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountry.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontCartPriceRuleCountry">
         <annotations>
             <features value="SalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRulePostcode.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRulePostcode.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml
index 97936382e60e0..e025d8b2a3b68 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRulePostcode.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcode.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontCartPriceRulePostcode">
         <annotations>
             <features value="SalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleQuantity.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleQuantity.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml
index f4342b5d480b4..3e54620d24937 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleQuantity.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantity.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontCartPriceRuleQuantity">
         <annotations>
             <features value="SalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleState.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleState.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml
index e2de2117d78e7..98c4b1144b475 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleState.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleState.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontCartPriceRuleState">
         <annotations>
             <features value="SalesRule"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleSubtotal.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleSubtotal.xml
rename to app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml
index 6c49534ee43c1..93c64903a337e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/Test/StorefrontCartPriceRuleSubtotal.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotal.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontCartPriceRuleSubtotal">
         <annotations>
             <features value="SalesRule"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/composer.json b/app/code/Magento/SalesRule/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..8839051a0848e
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "magento/functional-test-module-sales-rule",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-rule": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-reports": "100.0.0-dev",
+        "magento/functional-test-module-rule": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-shipping": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-widget": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-sales-rule-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/LICENSE.txt b/app/code/Magento/SalesSequence/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/LICENSE.txt
rename to app/code/Magento/SalesSequence/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/LICENSE_AFL.txt b/app/code/Magento/SalesSequence/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/LICENSE_AFL.txt
rename to app/code/Magento/SalesSequence/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SalesSequence/Test/Mftf/README.md b/app/code/Magento/SalesSequence/Test/Mftf/README.md
new file mode 100644
index 0000000000000..969f7d0daf509
--- /dev/null
+++ b/app/code/Magento/SalesSequence/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sales Sequence Functional Tests
+
+The Functional Test Module for **Magento Sales Sequence** module.
diff --git a/app/code/Magento/SalesSequence/Test/Mftf/composer.json b/app/code/Magento/SalesSequence/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..5649df3b7e0ea
--- /dev/null
+++ b/app/code/Magento/SalesSequence/Test/Mftf/composer.json
@@ -0,0 +1,16 @@
+{
+    "name": "magento/functional-test-module-sales-sequence",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/SampleData/Test/Mftf/README.md b/app/code/Magento/SampleData/Test/Mftf/README.md
new file mode 100644
index 0000000000000..dcadf692f4959
--- /dev/null
+++ b/app/code/Magento/SampleData/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sample Data Functional Tests
+
+The Functional Test Module for **Magento Sample Data** module.
diff --git a/app/code/Magento/SampleData/Test/Mftf/composer.json b/app/code/Magento/SampleData/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..039b87fa858b5
--- /dev/null
+++ b/app/code/Magento/SampleData/Test/Mftf/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/functional-test-module-sample-data",
+    "description": "Sample Data fixtures",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/sample-data-media": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/LICENSE.txt b/app/code/Magento/Search/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/LICENSE.txt
rename to app/code/Magento/Search/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/LICENSE_AFL.txt b/app/code/Magento/Search/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/LICENSE_AFL.txt
rename to app/code/Magento/Search/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Search/Test/Mftf/README.md b/app/code/Magento/Search/Test/Mftf/README.md
new file mode 100644
index 0000000000000..bd4bc14db41f7
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Search Functional Tests
+
+The Functional Test Module for **Magento Search** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/Section/StorefrontQuickSearchSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/Section/StorefrontQuickSearchSection.xml
rename to app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml
index 5770b43901e23..a1e15582b450d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/Section/StorefrontQuickSearchSection.xml
+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontQuickSearchSection">
         <element name="searchPhrase" type="input" selector="#search"/>
         <element name="searchButton" type="button" selector="button.action.search"/>
diff --git a/app/code/Magento/Search/Test/Mftf/composer.json b/app/code/Magento/Search/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..97cef910ffa02
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-search",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog-search": "100.0.0-dev",
+        "magento/functional-test-module-reports": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/LICENSE.txt b/app/code/Magento/Security/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/LICENSE.txt
rename to app/code/Magento/Security/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/LICENSE_AFL.txt b/app/code/Magento/Security/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/LICENSE_AFL.txt
rename to app/code/Magento/Security/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Security/Test/Mftf/README.md b/app/code/Magento/Security/Test/Mftf/README.md
new file mode 100644
index 0000000000000..65a0ff6c26e21
--- /dev/null
+++ b/app/code/Magento/Security/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Security Functional Tests
+
+The Functional Test Module for **Magento Security** module.
diff --git a/app/code/Magento/Security/Test/Mftf/composer.json b/app/code/Magento/Security/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..3429571c9b6d8
--- /dev/null
+++ b/app/code/Magento/Security/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-security",
+    "description": "Security management module",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-user": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-customer": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/LICENSE.txt b/app/code/Magento/SendFriend/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/LICENSE.txt
rename to app/code/Magento/SendFriend/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/LICENSE_AFL.txt b/app/code/Magento/SendFriend/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/LICENSE_AFL.txt
rename to app/code/Magento/SendFriend/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SendFriend/Test/Mftf/README.md b/app/code/Magento/SendFriend/Test/Mftf/README.md
new file mode 100644
index 0000000000000..a6e18162013a3
--- /dev/null
+++ b/app/code/Magento/SendFriend/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Send Friend Functional Tests
+
+The Functional Test Module for **Magento Send Friend** module.
diff --git a/app/code/Magento/SendFriend/Test/Mftf/composer.json b/app/code/Magento/SendFriend/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..7e061e0159f02
--- /dev/null
+++ b/app/code/Magento/SendFriend/Test/Mftf/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/functional-test-module-send-friend",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/ActionGroup/AdminShipmentActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/ActionGroup/AdminShipmentActionGroup.xml
rename to app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
index 3f420c2051067..80db1fe9469a3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/ActionGroup/AdminShipmentActionGroup.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
 
     <actionGroup name="verifyBasicShipmentInformation">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/FlatRateShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/FlatRateShippingMethodData.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/FlatRateShippingMethodData.xml
rename to app/code/Magento/Shipping/Test/Mftf/Data/FlatRateShippingMethodData.xml
index 4827fe869d882..120517bffde8f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/FlatRateShippingMethodData.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Data/FlatRateShippingMethodData.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <!-- Enable Flat Rate Shipping method config -->
     <entity name="FlatRateShippingMethodConfig" type="flat_rate_shipping_method">
         <requiredEntity type="active">flatRateActiveEnable</requiredEntity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/FreeShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
similarity index 92%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/FreeShippingMethodData.xml
rename to app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
index 9b27264bc2df1..fba1970dba294 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/FreeShippingMethodData.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <!-- Enable Free Shipping method -->
     <entity name="FreeShippinMethodConfig" type="free_shipping_method">
         <requiredEntity type="active">freeActiveEnable</requiredEntity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/ShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/ShippingMethodData.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/ShippingMethodData.xml
rename to app/code/Magento/Shipping/Test/Mftf/Data/ShippingMethodData.xml
index 1c5139a5d7350..3e8613ec2e43f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Data/ShippingMethodData.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Data/ShippingMethodData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="DefaultFlatRateMethod" type="shipping">
         <data key="enabled">Yes</data>
         <data key="title">Flat Rate</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/LICENSE.txt b/app/code/Magento/Shipping/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/LICENSE.txt
rename to app/code/Magento/Shipping/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/LICENSE_AFL.txt b/app/code/Magento/Shipping/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/LICENSE_AFL.txt
rename to app/code/Magento/Shipping/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Metadata/shipping_methods-meta.xml b/app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Metadata/shipping_methods-meta.xml
rename to app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml
index 65127cedabd60..8b6a2aab74580 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Metadata/shipping_methods-meta.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="FlatRateShippingMethodSetup" dataType="flat_rate_shipping_method" type="create" auth="adminFormKey" url="/admin/system_config/save/section/carriers/" method="POST">
         <object key="groups" dataType="flat_rate_shipping_method">
             <object key="flatrate" dataType="flat_rate_shipping_method">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Page/AdminShipmentNewPage.xml b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Page/AdminShipmentNewPage.xml
rename to app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
index e1d7f8f451397..e6b3f1100dd88 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Page/AdminShipmentNewPage.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentNewPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminShipmentNewPage" url="order_shipment/new/order_id/" area="admin" module="Shipping">
         <section name="AdminShipmentMainActionsSection"/>
         <section name="AdminShipmentOrderInformationSection"/>
diff --git a/app/code/Magento/Shipping/Test/Mftf/README.md b/app/code/Magento/Shipping/Test/Mftf/README.md
new file mode 100644
index 0000000000000..6acc747f50d71
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Shipping Functional Tests
+
+The Functional Test Module for **Magento Shipping** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentAddressInformationSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentAddressInformationSection.xml
rename to app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
index ddfd21836b8d6..ea4dde8190bc7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentAddressInformationSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminShipmentAddressInformationSection">
         <element name="billingAddress" type="text" selector=".order-billing-address address"/>
         <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentItemsSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentItemsSection.xml
rename to app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
index 562ad729fe7f3..7c936a7420db9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentItemsSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminShipmentItemsSection">
         <element name="itemName" type="text" selector=".order-shipment-table tbody:nth-of-type({{row}}) .col-product .product-title" parameterized="true"/>
         <element name="itemSku" type="text" selector=".order-shipment-table tbody:nth-of-type({{row}}) .col-product .product-sku-block" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentMainActionsSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentMainActionsSection.xml
rename to app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml
index 5cd843e0ad8c4..506a7a496d8d8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentMainActionsSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentMainActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminShipmentMainActionsSection">
         <element name="submitShipment" type="button" selector="button.action-default.save.submit-button"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentOrderInformationSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderInformationSection.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentOrderInformationSection.xml
rename to app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderInformationSection.xml
index 9076ad5c249f9..56f5a3221535b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentOrderInformationSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentOrderInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminShipmentOrderInformationSection">
         <element name="orderId" type="text" selector="div.order-information span.title > a" timeout="30"/>
         <element name="orderDate" type="text" selector=".order-information table.order-information-table tr:first-of-type > td"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentPaymentShippingSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentPaymentShippingSection.xml
rename to app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml
index a97bb4813917c..e6004e8c59454 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentPaymentShippingSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminShipmentPaymentShippingSection">
         <element name="PaymentMethod" type="text" selector=".order-payment-method .order-payment-method-title"/>
         <element name="CurrencyInformation" type="text" selector=".order-payment-method .order-payment-currency"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentTotalSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentTotalSection.xml
rename to app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml
index 7496bfbdf228d..2a4150b19a454 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Section/AdminShipmentTotalSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminShipmentTotalSection">
         <element name="CommentText" type="textarea" selector="#shipment_comment_text"/>
         <element name="AppendComments" type="checkbox" selector=".order-totals input#notify_customer"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/EndToEndB2CAdminTest.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Test/EndToEndB2CAdminTest.xml
rename to app/code/Magento/Shipping/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index 2bd17fdb4a3ba..e14fed443ac0c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CAdminTest">
         <!--Ship Order-->
         <comment userInput="Admin creates shipment" stepKey="adminCreatesShipmentComment" before="clickShipAction"/>
diff --git a/app/code/Magento/Shipping/Test/Mftf/composer.json b/app/code/Magento/Shipping/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..1b640d86f907d
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/composer.json
@@ -0,0 +1,34 @@
+{
+    "name": "magento/functional-test-module-shipping",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-contact": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-user": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-fedex": "100.0.0-dev",
+        "magento/functional-test-module-ups": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/LICENSE.txt b/app/code/Magento/Signifyd/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/LICENSE.txt
rename to app/code/Magento/Signifyd/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/LICENSE_AFL.txt b/app/code/Magento/Signifyd/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/LICENSE_AFL.txt
rename to app/code/Magento/Signifyd/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Signifyd/Test/Mftf/README.md b/app/code/Magento/Signifyd/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9391d7b314ea5
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Signifyd Functional Tests
+
+The Functional Test Module for **Magento Signifyd** module.
diff --git a/app/code/Magento/Signifyd/Test/Mftf/composer.json b/app/code/Magento/Signifyd/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..dc969cc4780ef
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Mftf/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/functional-test-module-signifyd",
+    "description": "Submitting Case Entry to Signifyd on Order Creation",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "php": "~7.1.3||~7.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/LICENSE.txt b/app/code/Magento/Sitemap/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/LICENSE.txt
rename to app/code/Magento/Sitemap/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/LICENSE_AFL.txt b/app/code/Magento/Sitemap/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/LICENSE_AFL.txt
rename to app/code/Magento/Sitemap/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Sitemap/Test/Mftf/README.md b/app/code/Magento/Sitemap/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8d506744827f6
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Sitemap Functional Tests
+
+The Functional Test Module for **Magento Sitemap** module.
diff --git a/app/code/Magento/Sitemap/Test/Mftf/composer.json b/app/code/Magento/Sitemap/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..46ad680c9fb1e
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/composer.json
@@ -0,0 +1,28 @@
+{
+    "name": "magento/functional-test-module-sitemap",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-url-rewrite": "100.0.0-dev",
+        "magento/functional-test-module-cms": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-robots": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
rename to app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
index 980e540b6b9b4..e67e21e4c1e67 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <!-- Admin creates new Store group -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateNewStoreGroupActionGroup">
         <arguments>
             <argument name="website" type="string"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateStoreViewActionGroup.xml
rename to app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index 6e86f1b68dce3..b35b36bc667a7 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <!-- Test XML Example -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateStoreViewActionGroup">
         <arguments>
             <argument name="StoreGroup" defaultValue="_defaultStoreGroup"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateWebsiteActionGroup.xml
rename to app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
index 01d14f60bd011..709cfe8ec9c40 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminCreateWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <!-- Admin creates new custom website -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateWebsiteActionGroup">
         <arguments>
             <argument name="newWebsiteName" type="string"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteStoreViewActionGroup.xml
rename to app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
index 794f626f45e65..1267ebf8f440c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <!-- Test XML Example -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminDeleteStoreViewActionGroup">
         <arguments>
             <argument name="customStore" defaultValue="customStore"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
similarity index 89%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteWebsiteActionGroup.xml
rename to app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
index 8182a5d6dd1e3..0512a1f6fbc3f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminDeleteWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminDeleteWebsiteActionGroup">
         <arguments>
             <argument name="websiteName" type="string"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminSwitchStoreViewActionGroup.xml
rename to app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
index 8c4ecbed047b8..bd004f1fc7de3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/AdminSwitchStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <!-- Test XML Example -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminSwitchStoreViewActionGroup">
         <arguments>
             <argument name="storeView" defaultValue="customStore.name"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/CreateCustomStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/CreateCustomStoreViewActionGroup.xml
rename to app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml
index 7315a4fcde06f..1e23a85a78935 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/CreateCustomStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CreateCustomStoreViewActionGroup">
         <arguments>
             <argument name="storeGroupName" defaultValue="customStoreGroup.name"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/DeleteCustomStoreActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/DeleteCustomStoreActionGroup.xml
rename to app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
index ec735091041eb..0cac9bbd9954b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/DeleteCustomStoreActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeleteCustomStoreActionGroup">
         <arguments>
             <argument name="storeGroupName" defaultValue="customStoreGroup.name"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
rename to app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
index 9f06c2773dc3a..d14de9af9c14a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <!-- Test XML Example -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontSwitchStoreViewActionGroup">
         <arguments>
             <argument name="storeView" defaultValue="customStore"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml
rename to app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
index 1d0fcfd57b01e..036069977bf52 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultStore" type="store">
         <data key="name">Default Store View</data>
         <data key="code">default</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreGroupData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreGroupData.xml
rename to app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
index 891d307808760..50139a0a87862 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Data/StoreGroupData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultStoreGroup" type="group">
         <data key="name">Main Website Store</data>
         <data key="code">main_website_store</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/LICENSE.txt b/app/code/Magento/Store/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/LICENSE.txt
rename to app/code/Magento/Store/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/LICENSE_AFL.txt b/app/code/Magento/Store/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/LICENSE_AFL.txt
rename to app/code/Magento/Store/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/store-meta.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store-meta.xml
rename to app/code/Magento/Store/Test/Mftf/Metadata/store-meta.xml
index 8b1ada521da66..e0263b2c88869 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store-meta.xml
+++ b/app/code/Magento/Store/Test/Mftf/Metadata/store-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateStore" dataType="store" type="create"
                auth="adminFormKey" url="/admin/system_store/save" method="POST" successRegex="/messages-message-success/" returnRegex="" >
         <object dataType="store" key="store">
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store_group-meta.xml b/app/code/Magento/Store/Test/Mftf/Metadata/store_group-meta.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store_group-meta.xml
rename to app/code/Magento/Store/Test/Mftf/Metadata/store_group-meta.xml
index d2d085e60328e..bc117756a542b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Metadata/store_group-meta.xml
+++ b/app/code/Magento/Store/Test/Mftf/Metadata/store_group-meta.xml
@@ -6,7 +6,7 @@
   */
 -->
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateStoreGroup" dataType="group" type="create"
                auth="adminFormKey" url="/admin/system_store/save" method="POST" successRegex="/messages-message-success/" returnRegex="" >
         <contentType>application/x-www-form-urlencoded</contentType>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreDeletePage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreDeletePage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreDeletePage.xml
rename to app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreDeletePage.xml
index 2d9e114f0fd60..3ec22d3135137 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreDeletePage.xml
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreDeletePage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminSystemStoreDeletePage" url="system_store/deleteStore" module="Magento_Store" area="admin">
         <section name="AdminStoreBackupOptionsSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreEditPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreEditPage.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreEditPage.xml
rename to app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreEditPage.xml
index 6bcc6ea1596c6..fe2bfcab39ae4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreEditPage.xml
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreEditPage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminSystemStoreEditPage" url="system_store/editStore" module="Magento_Store" area="admin">
         <section name="AdminNewStoreViewMainActionsSection"/>
         <section name="AdminNewStoreSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupEditPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupEditPage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupEditPage.xml
rename to app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupEditPage.xml
index 186ab9fdc8131..634ee6d651af1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupEditPage.xml
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupEditPage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminSystemStoreGroupEditPage" url="admin/system_store/editGroup" area="admin" module="Magento_Store">
         <section name="AdminStoreGroupActionsSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupPage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupPage.xml
rename to app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupPage.xml
index 9c203241283dc..3c73d019aa540 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreGroupPage.xml
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreGroupPage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminSystemStoreGroupPage" url="admin/system_store/newGroup" module="Magento_Store" area="admin">
         <section name="AdminNewStoreGroupSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStorePage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStorePage.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStorePage.xml
rename to app/code/Magento/Store/Test/Mftf/Page/AdminSystemStorePage.xml
index d9ba01a88fa40..9eed4f6557a59 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStorePage.xml
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStorePage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminSystemStorePage" url="/admin/system_store/" area="admin" module="Magento_Store">
         <section name="AdminStoresMainActionsSection"/>
         <section name="AdminStoresGridSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreViewPage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreViewPage.xml
similarity index 70%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreViewPage.xml
rename to app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreViewPage.xml
index b4dbfcc494a3b..15ed31c19f996 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreViewPage.xml
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreViewPage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminSystemStoreViewPage" url="admin/system_store/newStore" module="Magento_Store" area="admin">
         <section name="AdminNewStoreViewMainActionsSection"/>
         <section name="AdminNewStoreSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreWebsitePage.xml b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreWebsitePage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreWebsitePage.xml
rename to app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreWebsitePage.xml
index 6b28b2f04ea09..6f99e4340a070 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Page/AdminSystemStoreWebsitePage.xml
+++ b/app/code/Magento/Store/Test/Mftf/Page/AdminSystemStoreWebsitePage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminSystemStoreWebsitePage" url="admin/system_store/newWebsite" module="Magento_Store" area="admin">
         <section name="AdminNewWebsiteSection"/>
     </page>
diff --git a/app/code/Magento/Store/Test/Mftf/README.md b/app/code/Magento/Store/Test/Mftf/README.md
new file mode 100644
index 0000000000000..18b37aad6d8ef
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Store Functional Tests
+
+The Functional Test Module for **Magento Store** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminMainActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminMainActionsSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
index 14429c298b5e5..0927a1ffc950b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminMainActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminMainActionsSection">
         <element name="storeSwitcher" type="text" selector=".store-switcher"/>
         <element name="storeViewDropdown" type="button" selector="#store-change-button"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
similarity index 77%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
index be22aa7f8c120..106a0f4de5e8b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminNewStoreGroupSection">
         <element name="storeGrpWebsiteDropdown" type="select" selector="#group_website_id"/>
         <element name="storeGrpNameTextField" type="input" selector="#group_name"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreSection.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreSection.xml
index 6ff8f6765de8f..cec7a1f4f81e1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminNewStoreSection">
         <element name="storeNameTextField" type="input" selector="#store_name"/>
         <element name="storeCodeTextField" type="input" selector="#store_code"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreViewActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreViewActionsSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
index f41ae17364a42..5f8e27f3ec101 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreViewActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminNewStoreViewActionsSection">
         <element name="backButton" type="button" selector="#back" timeout="30"/>
         <element name="delete" type="button" selector="#delete" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteActionsSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml
index 18d1ef2642ef8..8048ded87e260 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteActionsSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminNewWebsiteActionsSection">
         <element name="saveWebsite" type="button" selector="#save" timeout="30"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteSection.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteSection.xml
index 1195d1c76b0cd..21dee5f6b6e0d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewWebsiteSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminNewWebsiteSection">
         <element name="name" type="input" selector="#website_name"/>
         <element name="code" type="input" selector="#website_code"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoreBackupOptionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreBackupOptionsSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoreBackupOptionsSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/AdminStoreBackupOptionsSection.xml
index 3767311d76fe7..58248b1943714 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoreBackupOptionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreBackupOptionsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminStoreBackupOptionsSection">
         <element name="createBackupSelect" type="select" selector="select#store_create_backup"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoreGroupActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoreGroupActionsSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
index 0490b4c52a074..ae0283865b774 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoreGroupActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoreGroupActionsSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminStoreGroupActionsSection">
         <element name="saveButton" type="button" selector="#save" timeout="30" />
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresDeleteStoreGroupSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteStoreGroupSection.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresDeleteStoreGroupSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteStoreGroupSection.xml
index dd1bd6bbb099b..ba3d9660b44b3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresDeleteStoreGroupSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteStoreGroupSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminStoresDeleteStoreGroupSection">
         <element name="createDbBackup" type="select" selector="#store_create_backup"/>
         <element name="deleteStoreGroupButton" type="button" selector="#delete" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index c4f7f90f905a3..7630f316d8095 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminStoresGridControlsSection">
         <element name="createStoreView" type="button" selector="#add_store"/>
         <element name="createStore" type="button" selector="#add_group"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml
index e2d0f67faee08..d86a68d0f7b99 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminStoresMainActionsSection">
         <element name="createStoreViewButton" type="button" selector="#add_store" timeout="30"/>
         <element name="createStoreButton" type="button" selector="#add_group" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/StorefrontHeaderSection.xml b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/StorefrontHeaderSection.xml
rename to app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
index 0af16b806d392..4bb62a5a7f6b9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/StorefrontHeaderSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontHeaderSection">
         <element name="storeViewSwitcher" type="button" selector="#switcher-language-trigger"/>
         <element name="storeViewDropdown" type="button" selector="ul.switcher-dropdown"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Test/AdminCreateStoreGroupTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Test/AdminCreateStoreGroupTest.xml
rename to app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
index 1d3cad0cd4f27..e3345c1f2f094 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Test/AdminCreateStoreGroupTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <!-- Test XML Example -->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminCreateStoreGroupTest">
         <annotations>
             <features value="Store"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Test/AdminCreateStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Test/AdminCreateStoreViewTest.xml
rename to app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
index 9d6a71f009beb..d38d4dc992a2b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Test/AdminCreateStoreViewTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <!-- Test XML Example -->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
         <test name="AdminCreateStoreViewTest">
             <annotations>
                 <features value="Store"/>
diff --git a/app/code/Magento/Store/Test/Mftf/composer.json b/app/code/Magento/Store/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..81305cf049e6c
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/functional-test-module-store",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-deploy": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/StoreGraphQl/Test/Mftf/README.md b/app/code/Magento/StoreGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3e3588d2f7301
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Store Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Store Graph Ql** module.
diff --git a/app/code/Magento/StoreGraphQl/Test/Mftf/composer.json b/app/code/Magento/StoreGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..10407d0dc179c
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-store-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-graph-ql": "100.0.0-dev",
+        "magento/functional-test-module-catalog-graph-ql": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/LICENSE.txt b/app/code/Magento/Swagger/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/LICENSE.txt
rename to app/code/Magento/Swagger/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/LICENSE_AFL.txt b/app/code/Magento/Swagger/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/LICENSE_AFL.txt
rename to app/code/Magento/Swagger/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Swagger/Test/Mftf/README.md b/app/code/Magento/Swagger/Test/Mftf/README.md
new file mode 100644
index 0000000000000..0ec1c02814c6e
--- /dev/null
+++ b/app/code/Magento/Swagger/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swagger Functional Tests
+
+The Functional Test Module for **Magento Swagger** module.
diff --git a/app/code/Magento/Swagger/Test/Mftf/composer.json b/app/code/Magento/Swagger/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..a997257192fce
--- /dev/null
+++ b/app/code/Magento/Swagger/Test/Mftf/composer.json
@@ -0,0 +1,16 @@
+{
+    "name": "magento/functional-test-module-swagger",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/LICENSE.txt b/app/code/Magento/SwaggerWebapi/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/LICENSE.txt
rename to app/code/Magento/SwaggerWebapi/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/LICENSE_AFL.txt b/app/code/Magento/SwaggerWebapi/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/LICENSE_AFL.txt
rename to app/code/Magento/SwaggerWebapi/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SwaggerWebapi/Test/Mftf/README.md b/app/code/Magento/SwaggerWebapi/Test/Mftf/README.md
new file mode 100644
index 0000000000000..91d7c1522aa74
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swagger Webapi Functional Tests
+
+The Functional Test Module for **Magento Swagger Webapi** module.
diff --git a/app/code/Magento/SwaggerWebapi/Test/Mftf/composer.json b/app/code/Magento/SwaggerWebapi/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..22ed346ef2081
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-swagger-webapi",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-swagger": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/LICENSE.txt b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/LICENSE.txt
rename to app/code/Magento/SwaggerWebapiAsync/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/LICENSE_AFL.txt b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/LICENSE_AFL.txt
rename to app/code/Magento/SwaggerWebapiAsync/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/README.md b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/README.md
new file mode 100644
index 0000000000000..46c9dc293dd7d
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swagger Webapi Async Functional Tests
+
+The Functional Test Module for **Magento Swagger Webapi Async** module.
diff --git a/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/composer.json b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..fe20e7a539d03
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/functional-test-module-swagger-webapi-async",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-swagger": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/LICENSE.txt b/app/code/Magento/Swatches/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/LICENSE.txt
rename to app/code/Magento/Swatches/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/LICENSE_AFL.txt b/app/code/Magento/Swatches/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/LICENSE_AFL.txt
rename to app/code/Magento/Swatches/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Swatches/Test/Mftf/README.md b/app/code/Magento/Swatches/Test/Mftf/README.md
new file mode 100644
index 0000000000000..1bb664cc52d7a
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swatches Functional Tests
+
+The Functional Test Module for **Magento Swatches** module.
diff --git a/app/code/Magento/Swatches/Test/Mftf/composer.json b/app/code/Magento/Swatches/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..76c8037995754
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/composer.json
@@ -0,0 +1,28 @@
+{
+    "name": "magento/functional-test-module-swatches",
+    "description": "Add Swatches to Products",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-configurable-product": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-layered-navigation": "100.0.0-dev",
+        "magento/functional-test-module-swatches-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/app/code/Magento/SwatchesGraphQl/Test/Mftf/README.md b/app/code/Magento/SwatchesGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..3d31f777fa5b9
--- /dev/null
+++ b/app/code/Magento/SwatchesGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swatches Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Swatches Graph Ql** module.
diff --git a/app/code/Magento/SwatchesGraphQl/Test/Mftf/composer.json b/app/code/Magento/SwatchesGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..7a62d9bd33ab9
--- /dev/null
+++ b/app/code/Magento/SwatchesGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-swatches-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-swatches": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-catalog-graph-ql": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/LICENSE.txt b/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/LICENSE.txt
rename to app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/LICENSE_AFL.txt b/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/LICENSE_AFL.txt
rename to app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/README.md b/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/README.md
new file mode 100644
index 0000000000000..52402884b9f28
--- /dev/null
+++ b/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Swatches Layered Navigation Functional Tests
+
+The Functional Test Module for **Magento Swatches Layered Navigation** module.
diff --git a/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/composer.json b/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..e37d2bfda247d
--- /dev/null
+++ b/app/code/Magento/SwatchesLayeredNavigation/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-swatches-layered-navigation",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/magento-composer-installer": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/ActionGroup/AdminTaxActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/ActionGroup/AdminTaxActionGroup.xml
rename to app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
index 946402d080e99..6d6e5cea0fd34 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/ActionGroup/AdminTaxActionGroup.xml
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Change the tax configuration to display in cart and checkout flow -->
     <actionGroup name="editTaxConfigurationByUI">
         <!-- navigate to the tax configuration page -->
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Data/TaxCodeData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
similarity index 80%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Data/TaxCodeData.xml
rename to app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
index ac603751ddc78..e786616119c92 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Data/TaxCodeData.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="SimpleTaxNY" type="tax">
         <data key="state">New York</data>
         <data key="country">United States</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/LICENSE.txt b/app/code/Magento/Tax/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/LICENSE.txt
rename to app/code/Magento/Tax/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/LICENSE_AFL.txt b/app/code/Magento/Tax/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/LICENSE_AFL.txt
rename to app/code/Magento/Tax/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminNewTaxRulePage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminNewTaxRulePage.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminNewTaxRulePage.xml
rename to app/code/Magento/Tax/Test/Mftf/Page/AdminNewTaxRulePage.xml
index 74a0347b33c7c..cf7fcf041c1b1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminNewTaxRulePage.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminNewTaxRulePage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminNewTaxRulePage" url="tax/rule/new/" module="Magento_Tax" area="admin">
         <section name="AdminTaxRulesSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminTaxConfigurationPage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxConfigurationPage.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminTaxConfigurationPage.xml
rename to app/code/Magento/Tax/Test/Mftf/Page/AdminTaxConfigurationPage.xml
index b91344000ff50..d18e300983b5f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminTaxConfigurationPage.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxConfigurationPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminTaxConfigurationPage" url="admin/system_config/edit/section/tax/" area="admin" module="Magento_Tax">
         <section name="AdminConfigureTaxSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminTaxRateGridPage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRateGridPage.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminTaxRateGridPage.xml
rename to app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRateGridPage.xml
index a6624f6588d97..6073766a81692 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminTaxRateGridPage.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRateGridPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminTaxRateGridPage" url="tax/rate/" area="admin" module="Magento_Tax">
         <section name="AdminSecondaryGridSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminTaxRuleGridPage.xml b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleGridPage.xml
similarity index 68%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminTaxRuleGridPage.xml
rename to app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleGridPage.xml
index e673da4a761f0..8c75237a203a6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Page/AdminTaxRuleGridPage.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Page/AdminTaxRuleGridPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminTaxRuleGridPage" url="tax/rule" area="admin" module="Magento_Tax">
         <section name="AdminSecondaryGridSection"/>
         <section name="AdminGridMainControls"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/README.md b/app/code/Magento/Tax/Test/Mftf/README.md
new file mode 100644
index 0000000000000..43f3bace41c18
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Tax Functional Tests
+
+The Functional Test Module for **Magento Tax** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Section/AdminConfigureTaxSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
similarity index 93%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Section/AdminConfigureTaxSection.xml
rename to app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
index 8ae17928d3bbd..ad68179119834 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Section/AdminConfigureTaxSection.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminConfigureTaxSection">
         <!-- on page /admin/admin/system_config/edit/section/tax/ -->
         <element name="taxClasses" type="block" selector="#tax_classes-head" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Section/AdminTaxRulesSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Section/AdminTaxRulesSection.xml
rename to app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml
index df3a56a36bc4a..f7b72263c1255 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Section/AdminTaxRulesSection.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminTaxRulesSection">
         <!-- on page /admin/tax/rule/new/ -->
         <element name="ruleName" type="input" selector="#anchor-content #code"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Test/StorefrontTaxQuoteCartTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Test/StorefrontTaxQuoteCartTest.xml
rename to app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
index 2607775ce7f36..752585830638f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Test/StorefrontTaxQuoteCartTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml
@@ -1,458 +1,458 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <test name="StorefrontTaxQuoteCartLoggedInSimple">
-        <annotations>
-            <features value="Tax"/>
-            <stories value="Tax Calculation in Shopping Cart"/>
-            <title value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
-            <description value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-295"/>
-            <group value="Tax"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-
-            <!-- Fill in rules to display tax in the cart -->
-            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
-
-            <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
-            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
-            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
-
-            <!-- Add NY and CA tax rules -->
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
-                <argument name="taxCode" value="SimpleTaxNY"/>
-            </actionGroup>
-
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
-                <argument name="taxCode" value="SimpleTaxCA"/>
-            </actionGroup>
-
-            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
-
-            <!-- Fill out form for a new user with address -->
-            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-                <argument name="Customer" value="Simple_US_Customer_NY"/>
-            </actionGroup>
-
-            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
-                <argument name="Address" value="US_Address_NY"/>
-            </actionGroup>
-        </before>
-        <after>
-            <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
-                <argument name="name" value="SampleRule"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
-
-            <!-- Delete the two tax rates that were created -->
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
-                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
-                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Ensure tax wont be shown in the cart -->
-            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
-
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-        </after>
-
-        <!-- Go to the created product page and add it to the cart -->
-        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
-        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
-        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
-        <waitForPageLoad stepKey="waitForProductAdded"/>
-        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
-
-        <!-- Assert that taxes are applied correctly for NY -->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForCart"/>
-
-        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
-        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
-        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
-        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
-
-        <!-- Change the address -->
-        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
-            <argument name="taxCode" value="SimpleTaxSwiss"/>
-        </actionGroup>
-
-        <!-- Assert that taxes are applied correctly for Switzerland -->
-        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
-        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$128.00"/>
-        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
-
-        <!-- Change the address -->
-        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
-            <argument name="taxCode" value="SimpleTaxCA"/>
-        </actionGroup>
-
-        <!-- Assert that taxes are applied correctly for CA -->
-        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
-        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
-        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
-        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
-    </test>
-
-
-    <test name="StorefrontTaxQuoteCartLoggedInVirtual">
-        <annotations>
-            <features value="Tax"/>
-            <stories value="Tax Calculation in Shopping Cart"/>
-            <title value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
-            <description value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-296"/>
-            <group value="Tax"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
-
-            <!-- Fill in rules to display tax in the cart -->
-            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
-
-            <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
-            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
-            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
-
-            <!-- Add NY and CA tax rules -->
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
-                <argument name="taxCode" value="SimpleTaxNY"/>
-            </actionGroup>
-
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
-                <argument name="taxCode" value="SimpleTaxCA"/>
-            </actionGroup>
-
-            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
-
-            <!-- Fill out form for a new user with address -->
-            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-                <argument name="Customer" value="Simple_US_Customer_NY"/>
-            </actionGroup>
-
-            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
-                <argument name="Address" value="US_Address_NY"/>
-            </actionGroup>
-        </before>
-        <after>
-            <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
-                <argument name="name" value="SampleRule"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
-
-            <!-- Delete the two tax rates that were created -->
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
-                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
-                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Ensure tax wont be shown in the cart -->
-            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
-
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
-        </after>
-
-        <!-- Go to the created product page and add it to the cart -->
-        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
-        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
-        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
-        <waitForPageLoad stepKey="waitForProductAdded"/>
-        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
-
-        <!-- Assert that taxes are applied correctly for NY -->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForCart"/>
-
-        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
-        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
-        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
-        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
-
-        <!-- Change the address -->
-        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
-            <argument name="taxCode" value="SimpleTaxSwiss"/>
-        </actionGroup>
-
-        <!-- Assert that taxes are applied correctly for Switzerland -->
-        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
-        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$$$virtualProduct1.price$$"/>
-        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$$virtualProduct1.price$$"/>
-
-        <!-- Change the address -->
-        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
-            <argument name="taxCode" value="SimpleTaxCA"/>
-        </actionGroup>
-
-        <!-- Assert that taxes are applied correctly for CA -->
-        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
-        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
-        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
-        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
-    </test>
-
-    <test name="StorefrontTaxQuoteCartGuestSimple">
-        <annotations>
-            <features value="Tax"/>
-            <stories value="Tax Calculation in Shopping Cart"/>
-            <title value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Guest Customer"/>
-            <description value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Guest Customer#anch"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-297"/>
-            <group value="Tax"/>
-            <group value="skip"/>
-            <!-- skipped due to MAGETWO-90539 -->
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-
-            <!-- Fill in rules to display tax in the cart -->
-            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
-
-            <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
-            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
-            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
-
-            <!-- Add NY and CA tax rules -->
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
-                <argument name="taxCode" value="SimpleTaxNY"/>
-            </actionGroup>
-
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
-                <argument name="taxCode" value="SimpleTaxCA"/>
-            </actionGroup>
-
-            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
-        </before>
-        <after>
-            <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
-                <argument name="name" value="SampleRule"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
-
-            <!-- Delete the two tax rates that were created -->
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
-                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
-                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Ensure tax wont be shown in the cart -->
-            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
-
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-        </after>
-
-        <!-- Go to the created product page and add it to the cart -->
-        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
-        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
-        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
-        <waitForPageLoad stepKey="waitForProductAdded"/>
-        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
-
-        <!-- Assert that taxes are applied correctly for CA -->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForCart"/>
-
-        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
-        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
-        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
-        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
-
-        <!-- Change the address -->
-        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
-            <argument name="taxCode" value="SimpleTaxSwiss"/>
-        </actionGroup>
-
-        <!-- Assert that taxes are applied correctly for Switzerland -->
-        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
-        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$128.00"/>
-        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
-
-        <!-- Change the address -->
-        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
-            <argument name="taxCode" value="SimpleTaxNY"/>
-        </actionGroup>
-
-        <!-- Assert that taxes are applied correctly for NY -->
-        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
-        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
-        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
-        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
-    </test>
-
-    <test name="StorefrontTaxQuoteCartGuestVirtual">
-        <annotations>
-            <features value="Tax"/>
-            <stories value="Tax Calculation in Shopping Cart"/>
-            <title value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Guest Customer"/>
-            <description value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Guest Customer"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-298"/>
-            <group value="Tax"/>
-            <group value="skip"/>
-            <!-- Skipped due to MAGETWO-90539 -->
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
-
-            <!-- Fill in rules to display tax in the cart -->
-            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
-
-            <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
-            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
-            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
-
-            <!-- Add NY and CA tax rules -->
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
-                <argument name="taxCode" value="SimpleTaxNY"/>
-            </actionGroup>
-
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
-                <argument name="taxCode" value="SimpleTaxCA"/>
-            </actionGroup>
-
-            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
-        </before>
-        <after>
-            <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
-                <argument name="name" value="SampleRule"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
-
-            <!-- Delete the two tax rates that were created -->
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
-                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
-                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Ensure tax wont be shown in the cart -->
-            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
-
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
-        </after>
-
-        <!-- Go to the created product page and add it to the cart -->
-        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
-        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
-        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
-        <waitForPageLoad stepKey="waitForProductAdded"/>
-        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
-
-        <!-- Assert that taxes are applied correctly for NY -->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForCart"/>
-
-        <!-- Assert that taxes are applied correctly for CA -->
-        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
-        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
-        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
-        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
-
-        <!-- Change the address -->
-        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
-            <argument name="taxCode" value="SimpleTaxSwiss"/>
-        </actionGroup>
-
-        <!-- Assert that taxes are applied correctly for Switzerland -->
-        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
-        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$$$virtualProduct1.price$$"/>
-        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$$virtualProduct1.price$$"/>
-
-        <!-- Change the address -->
-        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
-            <argument name="taxCode" value="SimpleTaxNY"/>
-        </actionGroup>
-
-        <!-- Assert that taxes are applied correctly for NY -->
-        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
-        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
-        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
-        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
-    </test>
-</tests>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxQuoteCartLoggedInSimple">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in Shopping Cart"/>
+            <title value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
+            <description value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-295"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <!-- Fill out form for a new user with address -->
+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+                <argument name="Customer" value="Simple_US_Customer_NY"/>
+            </actionGroup>
+
+            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+                <argument name="Address" value="US_Address_NY"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax wont be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
+        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
+            <argument name="taxCode" value="SimpleTaxSwiss"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for Switzerland -->
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$128.00"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
+            <argument name="taxCode" value="SimpleTaxCA"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
+        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+    </test>
+
+
+    <test name="StorefrontTaxQuoteCartLoggedInVirtual">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in Shopping Cart"/>
+            <title value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
+            <description value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Logged in Customer with Default Address"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-296"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <!-- Fill out form for a new user with address -->
+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+                <argument name="Customer" value="Simple_US_Customer_NY"/>
+            </actionGroup>
+
+            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+                <argument name="Address" value="US_Address_NY"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax wont be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
+        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
+            <argument name="taxCode" value="SimpleTaxSwiss"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for Switzerland -->
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$$$virtualProduct1.price$$"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
+            <argument name="taxCode" value="SimpleTaxCA"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
+        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+    </test>
+
+    <test name="StorefrontTaxQuoteCartGuestSimple">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in Shopping Cart"/>
+            <title value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Guest Customer"/>
+            <description value="Tax for Simple Product Quote should be recalculated in Shopping Cart for Guest Customer#anch"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-297"/>
+            <group value="Tax"/>
+            <group value="skip"/>
+            <!-- skipped due to MAGETWO-90539 -->
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax wont be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
+        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
+        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
+            <argument name="taxCode" value="SimpleTaxSwiss"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for Switzerland -->
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$128.00"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
+            <argument name="taxCode" value="SimpleTaxNY"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+    </test>
+
+    <test name="StorefrontTaxQuoteCartGuestVirtual">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in Shopping Cart"/>
+            <title value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Guest Customer"/>
+            <description value="Tax for Virtual Product Quote should be recalculated in Shopping Cart for Guest Customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-298"/>
+            <group value="Tax"/>
+            <group value="skip"/>
+            <!-- Skipped due to MAGETWO-90539 -->
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax wont be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
+        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax3" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl3" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
+        <see stepKey="seeTotalExcl3" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress">
+            <argument name="taxCode" value="SimpleTaxSwiss"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for Switzerland -->
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$0.00"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$$$virtualProduct1.price$$"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="changeSummaryQuoteAddress" stepKey="changeAddress2">
+            <argument name="taxCode" value="SimpleTaxNY"/>
+        </actionGroup>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Test/StorefrontTaxQuoteCheckoutTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Test/StorefrontTaxQuoteCheckoutTest.xml
rename to app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
index 6b60201a00709..f051d4f8c3b82 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/Test/StorefrontTaxQuoteCheckoutTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest.xml
@@ -1,458 +1,458 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <test name="StorefrontTaxQuoteCheckoutGuestVirtual">
-        <annotations>
-            <features value="Tax"/>
-            <stories value="Tax Calculation in One Page Checkout"/>
-            <title value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
-            <description value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-255"/>
-            <group value="Tax"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
-
-            <!-- Fill in rules to display tax in the cart -->
-            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
-
-            <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
-            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
-            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
-
-            <!-- Add NY and CA tax rules -->
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
-                <argument name="taxCode" value="SimpleTaxNY"/>
-            </actionGroup>
-
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
-                <argument name="taxCode" value="SimpleTaxCA"/>
-            </actionGroup>
-
-            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
-        </before>
-        <after>
-            <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
-                <argument name="name" value="SampleRule"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
-
-            <!-- Delete the two tax rates that were created -->
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
-                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
-                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Ensure tax wont be shown in the cart -->
-            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
-
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
-        </after>
-
-        <!-- Go to the created product page and add it to the cart -->
-        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
-        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
-        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
-        <waitForPageLoad stepKey="waitForProductAdded"/>
-        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
-
-        <!-- Assert that taxes are applied correctly for CA -->
-        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForShippingSection"/>
-
-        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
-        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
-        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
-        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
-
-        <!-- Change the address -->
-        <actionGroup ref="GuestCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
-            <argument name="customerVar" value="Simple_US_Customer_NY"/>
-            <argument name="customerAddressVar" value="US_Address_NY"/>
-        </actionGroup>
-        <click stepKey="saveAddress" selector="{{CheckoutShippingSection.updateAddress}}"/>
-
-        <waitForPageLoad stepKey="waitForAddressSaved"/>
-        <see stepKey="seeEditButton" selector="{{CheckoutShippingSection.editAddressButton}}" userInput="Edit"/>
-        <see stepKey="seeAddress2" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxNY.state}}"/>
-
-        <!-- Assert that taxes are applied correctly for NY -->
-        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
-        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
-        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
-        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
-    </test>
-
-    <test name="StorefrontTaxQuoteCheckoutLoggedInSimple">
-        <annotations>
-            <features value="Tax"/>
-            <stories value="Tax Calculation in One Page Checkout"/>
-            <title value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
-            <description value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-256"/>
-            <group value="Tax"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-
-            <!-- Fill in rules to display tax in the cart -->
-            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
-
-            <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
-            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
-            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
-
-            <!-- Add NY and CA tax rules -->
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
-                <argument name="taxCode" value="SimpleTaxNY"/>
-            </actionGroup>
-
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
-                <argument name="taxCode" value="SimpleTaxCA"/>
-            </actionGroup>
-
-            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
-
-            <!-- Fill out form for a new user with address -->
-            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-                <argument name="Customer" value="Simple_US_Customer_NY"/>
-            </actionGroup>
-
-            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
-                <argument name="Address" value="US_Address_NY"/>
-            </actionGroup>
-        </before>
-        <after>
-            <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
-                <argument name="name" value="SampleRule"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
-
-            <!-- Delete the two tax rates that were created -->
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
-                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
-                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Ensure tax wont be shown in the cart -->
-            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
-
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-        </after>
-
-        <!-- Go to the created product page and add it to the cart -->
-        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
-        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
-        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
-        <waitForPageLoad stepKey="waitForProductAdded"/>
-        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
-
-        <!-- Assert that taxes are applied correctly for NY -->
-        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForShippingSection"/>
-        <see stepKey="seeAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{SimpleTaxNY.state}}"/>
-        <click stepKey="clickNext" selector="{{CheckoutShippingSection.next}}"/>
-        <waitForPageLoad stepKey="waitForReviewAndPayments"/>
-
-        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
-        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
-        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
-        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
-
-        <!-- Go back to the shipping page and change the address -->
-        <click stepKey="goBackToShipping" selector="{{CheckoutShippingSection.shippingTab}}"/>
-        <click stepKey="addNewAddress" selector="{{CheckoutShippingSection.newAddressButton}}"/>
-        <waitForPageLoad stepKey="waitForAddressPopUp"/>
-
-        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
-            <argument name="Address" value="US_Address_CA"/>
-            <argument name="classPrefix" value="._show"/>
-        </actionGroup>
-        <click stepKey="saveAddress" selector="{{CheckoutShippingSection.saveAddress}}"/>
-
-        <waitForPageLoad stepKey="waitForAddressSaved"/>
-        <see stepKey="seeAddress2" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{SimpleTaxCA.state}}"/>
-        <click stepKey="clickNext2" selector="{{CheckoutShippingSection.next}}"/>
-        <waitForPageLoad stepKey="waitForReviewAndPayments2"/>
-
-        <!-- Assert that taxes are applied correctly for CA -->
-        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
-        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
-        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
-        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
-    </test>
-
-    <test name="StorefrontTaxQuoteCheckoutGuestSimple">
-        <annotations>
-            <features value="Tax"/>
-            <stories value="Tax Calculation in One Page Checkout"/>
-            <title value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
-            <description value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-258"/>
-            <group value="Tax"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
-
-            <!-- Fill in rules to display tax in the cart -->
-            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
-
-            <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
-            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
-            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
-
-            <!-- Add NY and CA tax rules -->
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
-                <argument name="taxCode" value="SimpleTaxNY"/>
-            </actionGroup>
-
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
-                <argument name="taxCode" value="SimpleTaxCA"/>
-            </actionGroup>
-
-            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
-        </before>
-        <after>
-            <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
-                <argument name="name" value="SampleRule"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
-
-            <!-- Delete the two tax rates that were created -->
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
-                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
-                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Ensure tax wont be shown in the cart -->
-            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
-
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-        </after>
-
-        <!-- Go to the created product page and add it to the cart -->
-        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
-        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
-        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
-        <waitForPageLoad stepKey="waitForProductAdded"/>
-        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
-
-        <!-- Fill in address for CA -->
-        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForShippingSection"/>
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{Simple_US_Customer_CA.email}}" stepKey="enterEmail"/>
-        <waitForLoadingMaskToDisappear stepKey="waitEmailLoad" />
-        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
-            <argument name="Address" value="US_Address_CA"/>
-        </actionGroup>
-        <click stepKey="clickNext" selector="{{CheckoutShippingSection.next}}"/>
-        <see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxCA.state}}"/>
-        <see stepKey="seeShipTo" selector="{{CheckoutPaymentSection.shipToInfomation}}" userInput="{{SimpleTaxCA.state}}"/>
-
-        <!-- Assert that taxes are applied correctly for CA -->
-        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
-        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
-        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
-        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
-
-        <!-- Go back to the shipping page and change the address -->
-        <click stepKey="goBackToShipping" selector="{{CheckoutShippingSection.shippingTab}}"/>
-        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress2">
-            <argument name="Address" value="US_Address_NY"/>
-        </actionGroup>
-        <click stepKey="clickNext2" selector="{{CheckoutShippingSection.next}}"/>
-        <see stepKey="seeShipTo2" selector="{{CheckoutPaymentSection.shipToInfomation}}" userInput="{{SimpleTaxNY.state}}"/>
-
-        <!-- Assert that taxes are applied correctly for NY -->
-        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
-        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
-        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
-        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
-    </test>
-
-    <test name="StorefrontTaxQuoteCheckoutLoggedInVirtual">
-        <annotations>
-            <features value="Tax"/>
-            <stories value="Tax Calculation in One Page Checkout"/>
-            <title value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
-            <description value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-259"/>
-            <group value="Tax"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
-
-            <!-- Fill in rules to display tax in the cart -->
-            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
-
-            <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
-            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
-            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
-
-            <!-- Add NY and CA tax rules -->
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
-                <argument name="taxCode" value="SimpleTaxNY"/>
-            </actionGroup>
-
-            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
-                <argument name="taxCode" value="SimpleTaxCA"/>
-            </actionGroup>
-
-            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
-
-            <!-- Fill out form for a new user with address -->
-            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
-                <argument name="Customer" value="Simple_US_Customer_NY"/>
-            </actionGroup>
-
-            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
-                <argument name="Address" value="US_Address_NY"/>
-            </actionGroup>
-        </before>
-        <after>
-            <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
-                <argument name="name" value="SampleRule"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
-
-            <!-- Delete the two tax rates that were created -->
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
-                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
-                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-
-            <!-- Ensure tax wont be shown in the cart -->
-            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
-
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
-        </after>
-
-        <!-- Go to the created product page and add it to the cart -->
-        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
-        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
-        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
-        <waitForPageLoad stepKey="waitForProductAdded"/>
-        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
-
-        <!-- Assert that taxes are applied correctly for NY -->
-        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForShippingSection"/>
-        <see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxNY.state}}"/>
-
-        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
-        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
-        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
-        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
-
-        <!-- Change the address -->
-        <click stepKey="editAddress" selector="{{CheckoutShippingSection.editAddressButton}}"/>
-        <selectOption stepKey="addNewAddress" selector="{{CheckoutShippingSection.addressDropdown}}" userInput="New Address"/>
-        <waitForPageLoad stepKey="waitForNewAddressForm"/>
-
-        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
-            <argument name="Address" value="US_Address_CA"/>
-            <argument name="classPrefix" value="[aria-hidden=false]"/>
-        </actionGroup>
-        <click stepKey="saveAddress" selector="{{CheckoutShippingSection.updateAddress}}"/>
-
-        <waitForPageLoad stepKey="waitForAddressSaved"/>
-        <see stepKey="seeAddress2" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxCA.state}}"/>
-
-        <!-- Assert that taxes are applied correctly for CA -->
-        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
-        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
-        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
-        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
-        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
-    </test>
-</tests>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StorefrontTaxQuoteCheckoutGuestVirtual">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in One Page Checkout"/>
+            <title value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
+            <description value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-255"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax wont be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
+        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForShippingSection"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <actionGroup ref="GuestCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
+            <argument name="customerVar" value="Simple_US_Customer_NY"/>
+            <argument name="customerAddressVar" value="US_Address_NY"/>
+        </actionGroup>
+        <click stepKey="saveAddress" selector="{{CheckoutShippingSection.updateAddress}}"/>
+
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+        <see stepKey="seeEditButton" selector="{{CheckoutShippingSection.editAddressButton}}" userInput="Edit"/>
+        <see stepKey="seeAddress2" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxNY.state}}"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+    </test>
+
+    <test name="StorefrontTaxQuoteCheckoutLoggedInSimple">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in One Page Checkout"/>
+            <title value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
+            <description value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-256"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <!-- Fill out form for a new user with address -->
+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+                <argument name="Customer" value="Simple_US_Customer_NY"/>
+            </actionGroup>
+
+            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+                <argument name="Address" value="US_Address_NY"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax wont be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
+        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForShippingSection"/>
+        <see stepKey="seeAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{SimpleTaxNY.state}}"/>
+        <click stepKey="clickNext" selector="{{CheckoutShippingSection.next}}"/>
+        <waitForPageLoad stepKey="waitForReviewAndPayments"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Go back to the shipping page and change the address -->
+        <click stepKey="goBackToShipping" selector="{{CheckoutShippingSection.shippingTab}}"/>
+        <click stepKey="addNewAddress" selector="{{CheckoutShippingSection.newAddressButton}}"/>
+        <waitForPageLoad stepKey="waitForAddressPopUp"/>
+
+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
+            <argument name="Address" value="US_Address_CA"/>
+            <argument name="classPrefix" value="._show"/>
+        </actionGroup>
+        <click stepKey="saveAddress" selector="{{CheckoutShippingSection.saveAddress}}"/>
+
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+        <see stepKey="seeAddress2" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{SimpleTaxCA.state}}"/>
+        <click stepKey="clickNext2" selector="{{CheckoutShippingSection.next}}"/>
+        <waitForPageLoad stepKey="waitForReviewAndPayments2"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+    </test>
+
+    <test name="StorefrontTaxQuoteCheckoutGuestSimple">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in One Page Checkout"/>
+            <title value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
+            <description value="Tax for Simple Product Quote should be recalculated according to inputted data on Checkout flow for Guest Customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-258"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax wont be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$simpleProduct1.sku$$.html" stepKey="goToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForSimpleProductPage"/>
+        <click stepKey="addSimpleProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Fill in address for CA -->
+        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForShippingSection"/>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{Simple_US_Customer_CA.email}}" stepKey="enterEmail"/>
+        <waitForLoadingMaskToDisappear stepKey="waitEmailLoad" />
+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
+            <argument name="Address" value="US_Address_CA"/>
+        </actionGroup>
+        <click stepKey="clickNext" selector="{{CheckoutShippingSection.next}}"/>
+        <see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxCA.state}}"/>
+        <see stepKey="seeShipTo" selector="{{CheckoutPaymentSection.shipToInfomation}}" userInput="{{SimpleTaxCA.state}}"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.15"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.15"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+
+        <!-- Go back to the shipping page and change the address -->
+        <click stepKey="goBackToShipping" selector="{{CheckoutShippingSection.shippingTab}}"/>
+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress2">
+            <argument name="Address" value="US_Address_NY"/>
+        </actionGroup>
+        <click stepKey="clickNext2" selector="{{CheckoutShippingSection.next}}"/>
+        <see stepKey="seeShipTo2" selector="{{CheckoutPaymentSection.shipToInfomation}}" userInput="{{SimpleTaxNY.state}}"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$138.30"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$128.00"/>
+    </test>
+
+    <test name="StorefrontTaxQuoteCheckoutLoggedInVirtual">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Tax Calculation in One Page Checkout"/>
+            <title value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
+            <description value="Tax for Virtual Product Quote should be recalculated according to inputted data on Checkout flow for Logged in Customer"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-259"/>
+            <group value="Tax"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="VirtualProduct" stepKey="virtualProduct1"/>
+
+            <!-- Fill in rules to display tax in the cart -->
+            <actionGroup ref="editTaxConfigurationByUI" stepKey="fillDefaultTaxForms"/>
+
+            <!-- Go to tax rule page -->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
+            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
+            <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
+
+            <!-- Add NY and CA tax rules -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNY"/>
+            </actionGroup>
+
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addCATaxRate">
+                <argument name="taxCode" value="SimpleTaxCA"/>
+            </actionGroup>
+
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <!-- Fill out form for a new user with address -->
+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+                <argument name="Customer" value="Simple_US_Customer_NY"/>
+            </actionGroup>
+
+            <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+                <argument name="Address" value="US_Address_NY"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Go to the tax rule page and delete the row we created-->
+            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
+                <argument name="name" value="SampleRule"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Go to the tax rate page -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+
+            <!-- Delete the two tax rates that were created -->
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteCARate">
+                <argument name="name" value="{{SimpleTaxCA.state}}-{{SimpleTaxCA.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+
+            <!-- Ensure tax wont be shown in the cart -->
+            <actionGroup ref="changeToDefaultTaxConfigurationUI" stepKey="changeToDefaultTaxConfiguration"/>
+
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
+        </after>
+
+        <!-- Go to the created product page and add it to the cart -->
+        <amOnPage url="$$virtualProduct1.sku$$.html" stepKey="goToVirtualProductPage"/>
+        <waitForPageLoad stepKey="waitForVirtualProductPage"/>
+        <click stepKey="addVirtualProductToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
+
+        <!-- Assert that taxes are applied correctly for NY -->
+        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForShippingSection"/>
+        <see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxNY.state}}"/>
+
+        <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.37"/>
+        <click stepKey="expandTax" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxNY.rate}}%)"/>
+        <see stepKey="seeTotalIncl" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.36"/>
+        <see stepKey="seeTotalExcl" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+
+        <!-- Change the address -->
+        <click stepKey="editAddress" selector="{{CheckoutShippingSection.editAddressButton}}"/>
+        <selectOption stepKey="addNewAddress" selector="{{CheckoutShippingSection.addressDropdown}}" userInput="New Address"/>
+        <waitForPageLoad stepKey="waitForNewAddressForm"/>
+
+        <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
+            <argument name="Address" value="US_Address_CA"/>
+            <argument name="classPrefix" value="[aria-hidden=false]"/>
+        </actionGroup>
+        <click stepKey="saveAddress" selector="{{CheckoutShippingSection.updateAddress}}"/>
+
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+        <see stepKey="seeAddress2" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxCA.state}}"/>
+
+        <!-- Assert that taxes are applied correctly for CA -->
+        <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
+        <click stepKey="expandTax2" selector="{{CheckoutPaymentSection.tax}}"/>
+        <see stepKey="seeTaxPercent2" selector="{{CheckoutPaymentSection.taxPercentage}}" userInput="({{SimpleTaxCA.rate}}%)"/>
+        <see stepKey="seeTotalIncl2" selector="{{CheckoutPaymentSection.orderSummaryTotalIncluding}}" userInput="$108.24"/>
+        <see stepKey="seeTotalExcl2" selector="{{CheckoutPaymentSection.orderSummaryTotalExcluding}}" userInput="$$virtualProduct1.price$$"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/composer.json b/app/code/Magento/Tax/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..e2d9db9f8f76e
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/composer.json
@@ -0,0 +1,32 @@
+{
+    "name": "magento/functional-test-module-tax",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-page-cache": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-reports": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-shipping": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-tax-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/TaxGraphQl/Test/Mftf/README.md b/app/code/Magento/TaxGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8914dc0865ada
--- /dev/null
+++ b/app/code/Magento/TaxGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Tax Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Tax Graph Ql** module.
diff --git a/app/code/Magento/TaxGraphQl/Test/Mftf/composer.json b/app/code/Magento/TaxGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..144f778833cd4
--- /dev/null
+++ b/app/code/Magento/TaxGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-tax-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-catalog-graph-ql": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/LICENSE.txt b/app/code/Magento/TaxImportExport/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/LICENSE.txt
rename to app/code/Magento/TaxImportExport/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/LICENSE_AFL.txt b/app/code/Magento/TaxImportExport/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/LICENSE_AFL.txt
rename to app/code/Magento/TaxImportExport/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/TaxImportExport/Test/Mftf/README.md b/app/code/Magento/TaxImportExport/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e53dd041cb34a
--- /dev/null
+++ b/app/code/Magento/TaxImportExport/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Tax Import Export Functional Tests
+
+The Functional Test Module for **Magento Tax Import Export** module.
diff --git a/app/code/Magento/TaxImportExport/Test/Mftf/composer.json b/app/code/Magento/TaxImportExport/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..39bc90df32651
--- /dev/null
+++ b/app/code/Magento/TaxImportExport/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-tax-import-export",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/LICENSE.txt b/app/code/Magento/Theme/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/LICENSE.txt
rename to app/code/Magento/Theme/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/LICENSE_AFL.txt b/app/code/Magento/Theme/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/LICENSE_AFL.txt
rename to app/code/Magento/Theme/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Page/ThemesPage.xml b/app/code/Magento/Theme/Test/Mftf/Page/ThemesPage.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Page/ThemesPage.xml
rename to app/code/Magento/Theme/Test/Mftf/Page/ThemesPage.xml
index 358d88875d02f..e0f0d2db70602 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Page/ThemesPage.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Page/ThemesPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="ThemesPageIndex" url="admin/system_design_theme/" area="admin" module="Magento_Theme">
         <section name="AdminThemeSection"/>
     </page>
diff --git a/app/code/Magento/Theme/Test/Mftf/README.md b/app/code/Magento/Theme/Test/Mftf/README.md
new file mode 100644
index 0000000000000..25b16385c3eca
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Theme Functional Tests
+
+The Functional Test Module for **Magento Theme** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/AdminThemeSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/AdminThemeSection.xml
rename to app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
index 281cc290b4f39..2e5a786d45725 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/AdminThemeSection.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminThemeSection">
         <!--All rows in a specific Column e.g. {{Section.rowsInColumn('columnName')}}-->
         <element name="rowsInColumn" type="text" selector="//tr/td[contains(@class, '{{column}}')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontFooterSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontFooterSection.xml
similarity index 58%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontFooterSection.xml
rename to app/code/Magento/Theme/Test/Mftf/Section/StorefrontFooterSection.xml
index 8fd7d03283df1..a9db1cbb9c776 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontFooterSection.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontFooterSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontFooterSection">
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontMessagesSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontMessagesSection.xml
similarity index 71%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontMessagesSection.xml
rename to app/code/Magento/Theme/Test/Mftf/Section/StorefrontMessagesSection.xml
index 981d12d0921a0..9b0b9c7a053bc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Section/StorefrontMessagesSection.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontMessagesSection">
         <element name="message" type="text"
                  selector="//main//div[contains(@class, 'messages')]//div[contains(@class, 'message')]/div[contains(text(), '{{var1}}')]"
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Test/ThemeTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/ThemeTest.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Test/ThemeTest.xml
rename to app/code/Magento/Theme/Test/Mftf/Test/ThemeTest.xml
index e243d1ad5284a..2ae24934a48df 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/Test/ThemeTest.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Test/ThemeTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="ThemeTest">
         <annotations>
             <features value="Theme Test"/>
diff --git a/app/code/Magento/Theme/Test/Mftf/composer.json b/app/code/Magento/Theme/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..f93dac15279a4
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/composer.json
@@ -0,0 +1,32 @@
+{
+    "name": "magento/functional-test-module-theme",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-cms": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-require-js": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-widget": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-translation": "100.0.0-dev",
+        "magento/functional-test-module-theme-sample-data": "100.0.0-dev",
+        "magento/functional-test-module-deploy": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/LICENSE.txt b/app/code/Magento/Tinymce3/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/LICENSE.txt
rename to app/code/Magento/Tinymce3/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/LICENSE_AFL.txt b/app/code/Magento/Tinymce3/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/LICENSE_AFL.txt
rename to app/code/Magento/Tinymce3/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/README.md b/app/code/Magento/Tinymce3/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e65a4afe26d88
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Tinymce3 Functional Tests
+
+The Functional Test Module for **Magento Tinymce3** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/Section/AdminTinymce3FileldsSection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/Section/AdminTinymce3FileldsSection.xml
rename to app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection.xml
index 1c666a9755420..83296abf61dc2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/Section/AdminTinymce3FileldsSection.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="ProductWYSIWYGSection">
         <element name="Tinymce3MSG" type="button" selector=".admin__field-error"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/Test/AdminSwitchWYSIWYGOptionsTest.xml b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/Test/AdminSwitchWYSIWYGOptionsTest.xml
rename to app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
index 350f3a77cbe5c..4a1c7e07c38c6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/Test/AdminSwitchWYSIWYGOptionsTest.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="AdminSwitchWYSIWYGOptionsTest">
         <annotations>
             <features value="Cms"/>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/composer.json b/app/code/Magento/Tinymce3/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..84c1f9376bf45
--- /dev/null
+++ b/app/code/Magento/Tinymce3/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-tinymce-3",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-ui": "100.0.0-dev",
+        "magento/functional-test-module-variable": "100.0.0-dev",
+        "magento/functional-test-module-widget": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-cms": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/LICENSE.txt b/app/code/Magento/Translation/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/LICENSE.txt
rename to app/code/Magento/Translation/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/LICENSE_AFL.txt b/app/code/Magento/Translation/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/LICENSE_AFL.txt
rename to app/code/Magento/Translation/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Translation/Test/Mftf/README.md b/app/code/Magento/Translation/Test/Mftf/README.md
new file mode 100644
index 0000000000000..99e8bd0e13ab3
--- /dev/null
+++ b/app/code/Magento/Translation/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Translation Functional Tests
+
+The Functional Test Module for **Magento Translation** module.
diff --git a/app/code/Magento/Translation/Test/Mftf/composer.json b/app/code/Magento/Translation/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..36bfa66adda0f
--- /dev/null
+++ b/app/code/Magento/Translation/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-translation",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-developer": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-deploy": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml
rename to app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml
index db89951690fc2..127647e6e9b48 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridFilterActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!--Search grid with keyword search-->
     <actionGroup name="searchAdminDataGridByKeyword">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
similarity index 86%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml
rename to app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
index ee981e06f4983..d05a7898872a0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminDataGridPaginationActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="adminDataGridSelectPerPage">
         <arguments>
             <argument name="perPage"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml
similarity index 83%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml
rename to app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml
index 459ad5070da01..41de4141b4c58 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminGridFilterSearchResultsByInput">
         <arguments>
             <argument name="selector"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminSaveAndCloseActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminSaveAndCloseActionGroup.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminSaveAndCloseActionGroup.xml
rename to app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminSaveAndCloseActionGroup.xml
index b8c36ba0b485f..133b81a5d6044 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminSaveAndCloseActionGroup.xml
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminSaveAndCloseActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminFormSaveAndClose">
         <click selector="{{AdminProductFormActionSection.saveArrow}}" stepKey="openSaveDropDown"/>
         <click selector="{{AdminProductFormActionSection.saveAndClose}}" stepKey="clickOnSaveAndClose"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/LICENSE.txt b/app/code/Magento/Ui/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/LICENSE.txt
rename to app/code/Magento/Ui/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/LICENSE_AFL.txt b/app/code/Magento/Ui/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/LICENSE_AFL.txt
rename to app/code/Magento/Ui/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Ui/Test/Mftf/README.md b/app/code/Magento/Ui/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9f61e8fc9a009
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Ui Functional Tests
+
+The Functional Test Module for **Magento Ui** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridHeaderSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridHeaderSection.xml
rename to app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
index 067756c4d4fb0..e5766300b0e87 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridHeaderSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminDataGridHeaderSection">
         <!--Search by keyword element-->
         <element name="search" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by keyword']"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridPaginationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridPaginationSection.xml
rename to app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
index d52d5ee4bb8a3..5e4fc5298bba8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridPaginationSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminDataGridPaginationSection">
         <element name="perPageDropdown" type="select" selector=".admin__data-grid-pager-wrap .selectmenu"/>
         <element name="perPageOption" type="button" selector="//div[@class='admin__data-grid-pager-wrap']//div[@class='selectmenu-items _active']//li//button[text()='{{label}}']" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridTableSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
similarity index 87%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridTableSection.xml
rename to app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
index 53228559f6d7c..2164af26e5ac4 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridTableSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminDataGridTableSection">
         <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection.xml
similarity index 96%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml
rename to app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection.xml
index 91bf1001a40c1..ac1e461e9e16b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <!-- TODO: Search, Notifications, Admin Menu -->
     <section name="AdminGridMainControls">
         <element name="add" type="button" selector="#add" timeout="30"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/ModalConfirmationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/ModalConfirmationSection.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/ModalConfirmationSection.xml
rename to app/code/Magento/Ui/Test/Mftf/Section/ModalConfirmationSection.xml
index 146aea30f4633..8c3dd505f66be 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/ModalConfirmationSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/ModalConfirmationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="ModalConfirmationSection">
         <element name="CancelButton" type="button" selector="//footer[@class='modal-footer']/button[contains(@class, 'action-dismiss')]"/>
         <element name="OkButton" type="button" selector="//footer[@class='modal-footer']/button[contains(@class, 'action-accept')]"/>
diff --git a/app/code/Magento/Ui/Test/Mftf/composer.json b/app/code/Magento/Ui/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..86a99d02bd959
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/functional-test-module-ui",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-authorization": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-user": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/LICENSE.txt b/app/code/Magento/Ups/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/LICENSE.txt
rename to app/code/Magento/Ups/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/LICENSE_AFL.txt b/app/code/Magento/Ups/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/LICENSE_AFL.txt
rename to app/code/Magento/Ups/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Ups/Test/Mftf/README.md b/app/code/Magento/Ups/Test/Mftf/README.md
new file mode 100644
index 0000000000000..9f3fe133f3228
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Ups Functional Tests
+
+The Functional Test Module for **Magento Ups** module.
diff --git a/app/code/Magento/Ups/Test/Mftf/composer.json b/app/code/Magento/Ups/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..560eaab1a19b1
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Mftf/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/functional-test-module-ups",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-shipping": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/LICENSE.txt b/app/code/Magento/UrlRewrite/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/LICENSE.txt
rename to app/code/Magento/UrlRewrite/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/LICENSE_AFL.txt b/app/code/Magento/UrlRewrite/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/LICENSE_AFL.txt
rename to app/code/Magento/UrlRewrite/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/README.md b/app/code/Magento/UrlRewrite/Test/Mftf/README.md
new file mode 100644
index 0000000000000..1d7cfbb915afa
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Url Rewrite Functional Tests
+
+The Functional Test Module for **Magento Url Rewrite** module.
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/composer.json b/app/code/Magento/UrlRewrite/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..2d906c3499ac6
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-url-rewrite",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-url-rewrite": "100.0.0-dev",
+        "magento/functional-test-module-cms": "100.0.0-dev",
+        "magento/functional-test-module-cms-url-rewrite": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/UrlRewriteGraphQl/Test/Mftf/README.md b/app/code/Magento/UrlRewriteGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..8825364e35cc6
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Url Rewrite Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Url Rewrite Graph Ql** module.
diff --git a/app/code/Magento/UrlRewriteGraphQl/Test/Mftf/composer.json b/app/code/Magento/UrlRewriteGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..06c58dbb59468
--- /dev/null
+++ b/app/code/Magento/UrlRewriteGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-url-rewrite-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-url-rewrite": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-graph-ql": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/ActionGroup/AdminCreateUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
similarity index 91%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/ActionGroup/AdminCreateUserActionGroup.xml
rename to app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
index f3edad3a082bb..e8aff30ff8d67 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/ActionGroup/AdminCreateUserActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateUserActionGroup">
         <arguments>
             <argument name="role"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Data/UserData.xml b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
similarity index 74%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Data/UserData.xml
rename to app/code/Magento/User/Test/Mftf/Data/UserData.xml
index d738e86a529c8..93bf0ccfa43d6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Data/UserData.xml
+++ b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="admin" type="user">
         <data key="email">admin@magento.com</data>
         <data key="password">admin123</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Data/UserRoleData.xml b/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Data/UserRoleData.xml
rename to app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
index 26df4b7afec65..39eea63356b7e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Data/UserRoleData.xml
+++ b/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="adminRole" type="role">
         <data key="name" unique="suffix">adminRole</data>
         <data key="scope">1</data>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/LICENSE.txt b/app/code/Magento/User/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/LICENSE.txt
rename to app/code/Magento/User/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/LICENSE_AFL.txt b/app/code/Magento/User/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/LICENSE_AFL.txt
rename to app/code/Magento/User/Test/Mftf/LICENSE_AFL.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminEditRolePage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminEditRolePage.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminEditRolePage.xml
rename to app/code/Magento/User/Test/Mftf/Page/AdminEditRolePage.xml
index 58dfad7f34263..8c71a815a3346 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminEditRolePage.xml
+++ b/app/code/Magento/User/Test/Mftf/Page/AdminEditRolePage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminEditRolePage" url="admin/user_role/editrole" module="Magento_User" area="admin">
         <section name="AdminEditRoleInfoSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminEditUserPage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminEditUserPage.xml
similarity index 69%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminEditUserPage.xml
rename to app/code/Magento/User/Test/Mftf/Page/AdminEditUserPage.xml
index 893b59503a891..7f6751c6f9e9b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminEditUserPage.xml
+++ b/app/code/Magento/User/Test/Mftf/Page/AdminEditUserPage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminEditUserPage" url="admin/user/new" area="admin" module="Magento_User">
         <section name="AdminEditUserSection"/>
         <section name="AdminEditUserRoleSection"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminRolesPage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminRolesPage.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminRolesPage.xml
rename to app/code/Magento/User/Test/Mftf/Page/AdminRolesPage.xml
index c056261ccbc4e..87cf0625670e0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminRolesPage.xml
+++ b/app/code/Magento/User/Test/Mftf/Page/AdminRolesPage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminRolesPage" url="admin/user_role/" module="Magento_User" area="admin">
         <section name="AdminRoleGridSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminUsersPage.xml b/app/code/Magento/User/Test/Mftf/Page/AdminUsersPage.xml
similarity index 66%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminUsersPage.xml
rename to app/code/Magento/User/Test/Mftf/Page/AdminUsersPage.xml
index d9e12d82f920f..2075cba2bdccb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Page/AdminUsersPage.xml
+++ b/app/code/Magento/User/Test/Mftf/Page/AdminUsersPage.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="AdminUsersPage" url="admin/user/" area="admin" module="Magento_User">
         <section name="AdminUserGridSection"/>
     </page>
diff --git a/app/code/Magento/User/Test/Mftf/README.md b/app/code/Magento/User/Test/Mftf/README.md
new file mode 100644
index 0000000000000..fbf07c88d5a9c
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# User Functional Tests
+
+The Functional Test Module for **Magento User** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminEditRoleInfoSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
index 69d1fdea9cb51..feb7b3e3bba8b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminEditRoleInfoSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminEditRoleInfoSection">
         <element name="roleName" type="input" selector="#role_name"/>
         <element name="password" type="input" selector="#current_password"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminEditUserRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserRoleSection.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminEditUserRoleSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminEditUserRoleSection.xml
index 857c36f9d71de..dc12205a84d9a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminEditUserRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserRoleSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminEditUserRoleSection">
         <element name="usernameTextField" type="input" selector="#user_username"/>
         <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminEditUserSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
similarity index 88%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminEditUserSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
index 0dbac0a9386c9..1406758b86118 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminEditUserSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminEditUserSection">
         <element name="usernameTextField" type="input" selector="#user_username"/>
         <element name="firstNameTextField" type="input" selector="#user_firstname"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminRoleGridSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminRoleGridSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
index 9b91f4e1dd2a9..1e1f3457995fe 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminRoleGridSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminRoleGridSection">
         <element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
         <element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminUserGridSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml
similarity index 81%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminUserGridSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml
index 98a714c6a3b64..b6d2645ac7384 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminUserGridSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminUserGridSection">
         <element name="usernameFilterTextField" type="input" selector="#permissionsUserGrid_filter_username"/>
         <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
diff --git a/app/code/Magento/User/Test/Mftf/composer.json b/app/code/Magento/User/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..6deceeb6b856f
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-user",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-authorization": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-email": "100.0.0-dev",
+        "magento/functional-test-module-integration": "100.0.0-dev",
+        "magento/functional-test-module-security": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/LICENSE.txt b/app/code/Magento/Usps/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/LICENSE.txt
rename to app/code/Magento/Usps/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/LICENSE_AFL.txt b/app/code/Magento/Usps/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/LICENSE_AFL.txt
rename to app/code/Magento/Usps/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Usps/Test/Mftf/README.md b/app/code/Magento/Usps/Test/Mftf/README.md
new file mode 100644
index 0000000000000..368556a4ba50d
--- /dev/null
+++ b/app/code/Magento/Usps/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Usps Functional Tests
+
+The Functional Test Module for **Magento Usps** module.
diff --git a/app/code/Magento/Usps/Test/Mftf/composer.json b/app/code/Magento/Usps/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..e3b487ad80d9f
--- /dev/null
+++ b/app/code/Magento/Usps/Test/Mftf/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/functional-test-module-usps",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-shipping": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/ActionGroup/CreateCustomVariableActionGroup.xml b/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
similarity index 90%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/ActionGroup/CreateCustomVariableActionGroup.xml
rename to app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
index 35742ad90bb76..0df617c876d8e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/ActionGroup/CreateCustomVariableActionGroup.xml
+++ b/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
@@ -7,7 +7,7 @@
         -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
 <actionGroup name="CreateCustomVariableActionGroup">
     <amOnPage url="admin/admin/system_variable/new/" stepKey="goToNewCustomVarialePage" />
     <waitForPageLoad stepKey="waitForPageLoad" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/Data/VariableData.xml b/app/code/Magento/Variable/Test/Mftf/Data/VariableData.xml
similarity index 73%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/Data/VariableData.xml
rename to app/code/Magento/Variable/Test/Mftf/Data/VariableData.xml
index 8a1d60839c155..9038030b30cbf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/Data/VariableData.xml
+++ b/app/code/Magento/Variable/Test/Mftf/Data/VariableData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultVariable" type="cms_page">
         <data key="city"> Austin </data>
     </entity>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/LICENSE.txt b/app/code/Magento/Variable/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/LICENSE.txt
rename to app/code/Magento/Variable/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/LICENSE_AFL.txt b/app/code/Magento/Variable/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/LICENSE_AFL.txt
rename to app/code/Magento/Variable/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Variable/Test/Mftf/README.md b/app/code/Magento/Variable/Test/Mftf/README.md
new file mode 100644
index 0000000000000..f2cd2ce8f4623
--- /dev/null
+++ b/app/code/Magento/Variable/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Variable Functional Tests
+
+The Functional Test Module for **Magento Variable** module.
diff --git a/app/code/Magento/Variable/Test/Mftf/composer.json b/app/code/Magento/Variable/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..2360634369fed
--- /dev/null
+++ b/app/code/Magento/Variable/Test/Mftf/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/functional-test-module-variable",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-config": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/LICENSE.txt b/app/code/Magento/Vault/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/LICENSE.txt
rename to app/code/Magento/Vault/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/LICENSE_AFL.txt b/app/code/Magento/Vault/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/LICENSE_AFL.txt
rename to app/code/Magento/Vault/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Vault/Test/Mftf/README.md b/app/code/Magento/Vault/Test/Mftf/README.md
new file mode 100644
index 0000000000000..aeb4c78619eee
--- /dev/null
+++ b/app/code/Magento/Vault/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Vault Functional Tests
+
+The Functional Test Module for **Magento Vault** module.
diff --git a/app/code/Magento/Vault/Test/Mftf/composer.json b/app/code/Magento/Vault/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..78e765bebc429
--- /dev/null
+++ b/app/code/Magento/Vault/Test/Mftf/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/functional-test-module-vault",
+    "description": "",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-payment": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "proprietary"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/LICENSE.txt b/app/code/Magento/Version/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/LICENSE.txt
rename to app/code/Magento/Version/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/LICENSE_AFL.txt b/app/code/Magento/Version/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/LICENSE_AFL.txt
rename to app/code/Magento/Version/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Version/Test/Mftf/README.md b/app/code/Magento/Version/Test/Mftf/README.md
new file mode 100644
index 0000000000000..a5b08aaa6d9d3
--- /dev/null
+++ b/app/code/Magento/Version/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Version Functional Tests
+
+The Functional Test Module for **Magento Version** module.
diff --git a/app/code/Magento/Version/Test/Mftf/composer.json b/app/code/Magento/Version/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..24037307b7878
--- /dev/null
+++ b/app/code/Magento/Version/Test/Mftf/composer.json
@@ -0,0 +1,16 @@
+{
+    "name": "magento/functional-test-module-version",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/LICENSE.txt b/app/code/Magento/Webapi/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/LICENSE.txt
rename to app/code/Magento/Webapi/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/LICENSE_AFL.txt b/app/code/Magento/Webapi/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/LICENSE_AFL.txt
rename to app/code/Magento/Webapi/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Webapi/Test/Mftf/README.md b/app/code/Magento/Webapi/Test/Mftf/README.md
new file mode 100644
index 0000000000000..c59b55fed533d
--- /dev/null
+++ b/app/code/Magento/Webapi/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Webapi Functional Tests
+
+The Functional Test Module for **Magento Webapi** module.
diff --git a/app/code/Magento/Webapi/Test/Mftf/composer.json b/app/code/Magento/Webapi/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..28d5769034a39
--- /dev/null
+++ b/app/code/Magento/Webapi/Test/Mftf/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/functional-test-module-webapi",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-authorization": "100.0.0-dev",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-integration": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-user": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/LICENSE.txt b/app/code/Magento/WebapiAsync/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/LICENSE.txt
rename to app/code/Magento/WebapiAsync/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/LICENSE_AFL.txt b/app/code/Magento/WebapiAsync/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/LICENSE_AFL.txt
rename to app/code/Magento/WebapiAsync/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/WebapiAsync/Test/Mftf/README.md b/app/code/Magento/WebapiAsync/Test/Mftf/README.md
new file mode 100644
index 0000000000000..58f8aa5e71308
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Webapi Async Functional Tests
+
+The Functional Test Module for **Magento Webapi Async** module.
diff --git a/app/code/Magento/WebapiAsync/Test/Mftf/composer.json b/app/code/Magento/WebapiAsync/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..6bf5375b7c873
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Mftf/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/functional-test-module-webapi-async",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-webapi": "100.0.0-dev",
+        "magento/functional-test-module-asynchronous-operations": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-user": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/LICENSE.txt b/app/code/Magento/WebapiSecurity/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/LICENSE.txt
rename to app/code/Magento/WebapiSecurity/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/LICENSE_AFL.txt b/app/code/Magento/WebapiSecurity/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/LICENSE_AFL.txt
rename to app/code/Magento/WebapiSecurity/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/WebapiSecurity/Test/Mftf/README.md b/app/code/Magento/WebapiSecurity/Test/Mftf/README.md
new file mode 100644
index 0000000000000..e3a1132fb9bb2
--- /dev/null
+++ b/app/code/Magento/WebapiSecurity/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Webapi Security Functional Tests
+
+The Functional Test Module for **Magento Webapi Security** module.
diff --git a/app/code/Magento/WebapiSecurity/Test/Mftf/composer.json b/app/code/Magento/WebapiSecurity/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..de96b3a3210f0
--- /dev/null
+++ b/app/code/Magento/WebapiSecurity/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-webapi-security",
+    "description": "WebapiSecurity module provides option to loosen security on some webapi resources.",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-webapi": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/LICENSE.txt b/app/code/Magento/Weee/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/LICENSE.txt
rename to app/code/Magento/Weee/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/LICENSE_AFL.txt b/app/code/Magento/Weee/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/LICENSE_AFL.txt
rename to app/code/Magento/Weee/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Weee/Test/Mftf/README.md b/app/code/Magento/Weee/Test/Mftf/README.md
new file mode 100644
index 0000000000000..78739e99958a5
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Weee Functional Tests
+
+The Functional Test Module for **Magento Weee** module.
diff --git a/app/code/Magento/Weee/Test/Mftf/composer.json b/app/code/Magento/Weee/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..9e5f7c5772a4e
--- /dev/null
+++ b/app/code/Magento/Weee/Test/Mftf/composer.json
@@ -0,0 +1,31 @@
+{
+    "name": "magento/functional-test-module-weee",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-directory": "100.0.0-dev",
+        "magento/functional-test-module-eav": "100.0.0-dev",
+        "magento/functional-test-module-page-cache": "100.0.0-dev",
+        "magento/functional-test-module-quote": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-tax": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-bundle": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/WeeeGraphQl/Test/Mftf/README.md b/app/code/Magento/WeeeGraphQl/Test/Mftf/README.md
new file mode 100644
index 0000000000000..d39ee3cc685f4
--- /dev/null
+++ b/app/code/Magento/WeeeGraphQl/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Weee Graph Ql Functional Tests
+
+The Functional Test Module for **Magento Weee Graph Ql** module.
diff --git a/app/code/Magento/WeeeGraphQl/Test/Mftf/composer.json b/app/code/Magento/WeeeGraphQl/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..09b1dc9afe551
--- /dev/null
+++ b/app/code/Magento/WeeeGraphQl/Test/Mftf/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-weee-graph-ql",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0"
+    },
+    "suggest": {
+        "magento/functional-test-module-weee": "100.0.0-dev",
+        "magento/functional-test-module-catalog-graph-ql": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/LICENSE.txt b/app/code/Magento/Widget/Test/Mftf/LICENSE.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/LICENSE.txt
rename to app/code/Magento/Widget/Test/Mftf/LICENSE.txt
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/LICENSE_AFL.txt b/app/code/Magento/Widget/Test/Mftf/LICENSE_AFL.txt
similarity index 100%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/LICENSE_AFL.txt
rename to app/code/Magento/Widget/Test/Mftf/LICENSE_AFL.txt
diff --git a/app/code/Magento/Widget/Test/Mftf/README.md b/app/code/Magento/Widget/Test/Mftf/README.md
new file mode 100644
index 0000000000000..0504cf39ca7f6
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Widget Functional Tests
+
+The Functional Test Module for **Magento Widget** module.
diff --git a/app/code/Magento/Widget/Test/Mftf/composer.json b/app/code/Magento/Widget/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..693fa651f5974
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/functional-test-module-widget",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-cms": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-theme": "100.0.0-dev",
+        "magento/functional-test-module-variable": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-widget-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
similarity index 95%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
rename to app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
index 122bfbe4cc1c5..dd816bb665782 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <!-- Add Product to wishlist from the category page and check message -->
     <actionGroup name="StorefrontCustomerAddCategoryProductToWishlistActionGroup">
         <arguments>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Data/WishlistData.xml b/app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml
similarity index 72%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Data/WishlistData.xml
rename to app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml
index daa700e27298d..93fb9a5689e17 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Data/WishlistData.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="Wishlist" type="wishlist">
         <data key="id">null</data>
         <var key="product" entityType="product" entityKey="id"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/LICENSE.txt b/app/code/Magento/Wishlist/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly. 
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/Wishlist/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/Wishlist/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly.
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Metadata/wishlist-meta.xml b/app/code/Magento/Wishlist/Test/Mftf/Metadata/wishlist-meta.xml
similarity index 76%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Metadata/wishlist-meta.xml
rename to app/code/Magento/Wishlist/Test/Mftf/Metadata/wishlist-meta.xml
index 0c793d9d1b07a..37f2bbe6a29d5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Metadata/wishlist-meta.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Metadata/wishlist-meta.xml
@@ -7,7 +7,7 @@
 -->
 
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateWishlist" dataType="wishlist" type="create"
                auth="customerFormKey" url="/wishlist/index/add/" method="POST" successRegex="" returnRegex="~\/wishlist_id\/(\d*?)\/~" >
         <contentType>application/x-www-form-urlencoded</contentType>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Page/StorefrontCustomerWishlistPage.xml b/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml
similarity index 67%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Page/StorefrontCustomerWishlistPage.xml
rename to app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml
index 256f9458f89d6..cf2db7efab6c6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Page/StorefrontCustomerWishlistPage.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Page/StorefrontCustomerWishlistPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
     <page name="StorefrontCustomerWishlistPage" url="/wishlist/" area="storefront" module="Magento_Wishlist">
         <section name="StorefrontCustomerWishlistSection" />
     </page>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/README.md b/app/code/Magento/Wishlist/Test/Mftf/README.md
new file mode 100644
index 0000000000000..b0df8b018736c
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Wishlist Functional Tests
+
+The Functional Test Module for **Magento Wishlist** module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCategoryProductSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCategoryProductSection.xml
similarity index 75%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCategoryProductSection.xml
rename to app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index 7229b596ddb19..20d72a0704699 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryProductSection">
         <element name="ProductAddToWishlistByNumber" type="text" selector="//main//li[{{var1}}]//a[contains(@class, 'towishlist')]" parameterized="true"/>
         <element name="ProductAddToWishlistByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'towishlist')]" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistProductSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
similarity index 84%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistProductSection.xml
rename to app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
index 94681db830dd5..bd9fadb630c95 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistProductSection.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerWishlistProductSection">
         <element name="ProductTitleByName" type="button" selector="//main//li//a[contains(text(), '{{var1}}')]" parameterized="true"/>
         <element name="ProductPriceByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//span[@class='price']" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
similarity index 79%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSection.xml
rename to app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
index 5a311f2a05d40..747ad958adbe0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSection.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerWishlistSection">
         <element name="pageTitle" type="text" selector="h1.page-title"/>
         <element name="successMsg" type="text" selector="div.message-success.success.message"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSidebarSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
similarity index 85%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSidebarSection.xml
rename to app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
index d4a81137dbc86..d3e89d419310c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontCustomerWishlistSidebarSection.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSidebarSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerWishlistSidebarSection">
         <element name="ProductTitleByName" type="button" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']" parameterized="true"/>
         <element name="ProductPriceByName" type="text" selector="//main//ol[@id='wishlist-sidebar']//a[@class='product-item-link']/span[text()='{{var1}}']//ancestor::ol//span[@class='price']" parameterized="true"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
similarity index 65%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontProductInfoMainSection.xml
rename to app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index d8e16ce9a4481..ea2dfcbedaa27 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoMainSection">
         <element name="productAddToWishlist" type="button" selector="a.action.towishlist"/>
     </section>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/EndToEndB2CLoggedInUserTest.xml
rename to app/code/Magento/Wishlist/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index b5a43fc471127..194737788eb7c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="EndToEndB2CLoggedInUserTest">
         <!-- Step 5: Add products to wishlist -->
         <comment userInput="Start of adding products to wishlist" stepKey="startOfAddingProductsToWishlist" after="endOfComparingProducts" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
similarity index 97%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
rename to app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
index da2239a0da85e..0a4d241b0e4ab 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontAddMultipleStoreProductsToWishlistTest">
         <annotations>
             <features value="Wishlist"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/StorefrontDeletePersistedWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
similarity index 94%
rename from dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/StorefrontDeletePersistedWishlistTest.xml
rename to app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
index 7b9c40d7f3d31..3ddb9d87073f3 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/StorefrontDeletePersistedWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="StorefrontDeletePersistedWishlistTest">
         <annotations>
             <features value="Wishlist"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/composer.json b/app/code/Magento/Wishlist/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..d016f9346f60c
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "magento/functional-test-module-wishlist",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-catalog": "100.0.0-dev",
+        "magento/functional-test-module-catalog-inventory": "100.0.0-dev",
+        "magento/functional-test-module-checkout": "100.0.0-dev",
+        "magento/functional-test-module-customer": "100.0.0-dev",
+        "magento/functional-test-module-rss": "100.0.0-dev",
+        "magento/functional-test-module-sales": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "suggest": {
+        "magento/functional-test-module-configurable-product": "100.0.0-dev",
+        "magento/functional-test-module-downloadable": "100.0.0-dev",
+        "magento/functional-test-module-bundle": "100.0.0-dev",
+        "magento/functional-test-module-cookie": "100.0.0-dev",
+        "magento/functional-test-module-grouped-product": "100.0.0-dev",
+        "magento/functional-test-module-wishlist-sample-data": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/app/code/Magento/WishlistAnalytics/Test/Mftf/LICENSE.txt b/app/code/Magento/WishlistAnalytics/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/Test/Mftf/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly. 
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/WishlistAnalytics/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/WishlistAnalytics/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/Test/Mftf/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly.
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/code/Magento/WishlistAnalytics/Test/Mftf/README.md b/app/code/Magento/WishlistAnalytics/Test/Mftf/README.md
new file mode 100644
index 0000000000000..ec5f69c59bac7
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Wishlist Analytics Functional Tests
+
+The Functional Test Module for **Magento Wishlist Analytics** module.
diff --git a/app/code/Magento/WishlistAnalytics/Test/Mftf/composer.json b/app/code/Magento/WishlistAnalytics/Test/Mftf/composer.json
new file mode 100644
index 0000000000000..6969178cfdaa6
--- /dev/null
+++ b/app/code/Magento/WishlistAnalytics/Test/Mftf/composer.json
@@ -0,0 +1,17 @@
+{
+    "name": "magento/functional-test-module-wishlist-analytics",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-wishlist": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/README.md
deleted file mode 100644
index c9275af071fa4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_AdminNotification** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json
deleted file mode 100644
index 49a59426cfa6d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-admin-notification",
-    "description": "Magento 2 Functional Test Module Admin Notification",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\AdminNotification\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/AdminNotification"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/README.md
deleted file mode 100644
index 2f01efe59522b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_AdvancedPricingImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json
deleted file mode 100644
index 96be03e146356..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-advanced-pricing-import-export",
-    "description": "Magento 2 Functional Test Module Advanced Pricing Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\AdvancedPricingImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/README.md
deleted file mode 100644
index d01404e4a1e9a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_AdvancedSearch** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/composer.json
deleted file mode 100644
index cd266da628c37..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-advanced-search",
-    "description": "Magento 2 Functional Test Module Advanced Search",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "proprietary"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-search": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-search": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\AdvancedSearch\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/README.md
deleted file mode 100644
index 49028ae41818b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Amqp** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/composer.json
deleted file mode 100644
index 82c2915dce58b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-amqp",
-    "description": "Magento 2 Functional Test Module Amqp",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "proprietary"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Amqp\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/README.md
deleted file mode 100644
index 56c1d77deeed0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_Analytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json
deleted file mode 100644
index cb59843c9cba8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-analytics",
-    "description": "Magento 2 Acceptance Test Module Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-integration": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Analytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Analytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/README.md
deleted file mode 100644
index 39f11e663cf01..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_AsynchronousOperations** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/composer.json
deleted file mode 100644
index 240b8aa3cca35..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-asynchronous-operations",
-    "description": "Magento 2 Functional Test Module Asynchronous Operations",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "proprietary"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-logging": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-user": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\AsynchronousOperations\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AsynchronousOperations"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/README.md
deleted file mode 100644
index c21edf02d3bc2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Authorization** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json
deleted file mode 100644
index 2eab99a968a9a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-authorization",
-    "description": "Magento 2 Functional Test Module Authorization",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Authorization\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Authorization"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/README.md
deleted file mode 100644
index c3a550699f661..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Authorizenet** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json
deleted file mode 100644
index 06dce68805cd9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-authorizenet",
-    "description": "Magento 2 Functional Test Module Authorizenet",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Authorizenet\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Authorizenet"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/README.md
deleted file mode 100644
index 0a7d14223c0b2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Backend** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json
deleted file mode 100644
index b2a99b07f0255..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-backend",
-    "description": "Magento 2 Functional Test Module Backend",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backup": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-developer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-reports": "100.0.0-dev",
-        "magento/magento2-functional-test-module-require-js": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-security": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-translation": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-user": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Backend\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Backend"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/README.md
deleted file mode 100644
index dc2a3ab06f9d3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Backup** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json
deleted file mode 100644
index c6e51064c592f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backup/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-backup",
-    "description": "Magento 2 Functional Test Module Backup",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cron": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Backup\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Backup"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/README.md
deleted file mode 100644
index b0b637c9d9621..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Braintree** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json
deleted file mode 100644
index d3a13786a0a9d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Braintree/composer.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-braintree",
-    "description": "Magento 2 Functional Test Module Braintree",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-instant-purchase": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-paypal": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-vault": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Braintree\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Braintree"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/README.md
deleted file mode 100644
index 9579aec287f4c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Bundle** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json
deleted file mode 100644
index 2219c9aa586bf..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/composer.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-bundle",
-    "description": "Magento 2 Functional Test Module Bundle",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-gift-message": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Bundle\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Bundle"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/README.md
deleted file mode 100644
index dc155d12f30db..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_BundleImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json
deleted file mode 100644
index fd79ec03d4ea9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/BundleImportExport/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-bundle-import-export",
-    "description": "Magento 2 Functional Test Module Bundle Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-bundle": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\BundleImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/BundleImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/README.md
deleted file mode 100644
index 47571bdb7f212..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CacheInvalidate** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json
deleted file mode 100644
index f59864d2a14ea..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CacheInvalidate/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-cache-invalidate",
-    "description": "Magento 2 Functional Test Module Cache Invalidate",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CacheInvalidate\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CacheInvalidate"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/README.md
deleted file mode 100644
index f0d35613be75d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Captcha** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json
deleted file mode 100644
index 0297dbb343bcb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Captcha/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-captcha",
-    "description": "Magento 2 Functional Test Module Captcha",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Captcha\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Captcha"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/README.md
deleted file mode 100644
index 41bb2b0d6042a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Catalog** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json
deleted file mode 100644
index c8f2484c9025a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/composer.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog",
-    "description": "Magento 2 Functional Test Module Catalog",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "~2.0.0",
-        "magento/magento2-functional-test-framework": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-indexer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-msrp": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-product-alert": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev",
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Catalog\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Catalog"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/README.md
deleted file mode 100644
index ee39f1deb58d3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_CatalogAnalytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json
deleted file mode 100644
index cce1015d0d2e5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-analytics",
-    "description": "Magento 2 Acceptance Test Module Catalog Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CatalogAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/README.md
deleted file mode 100644
index 9a514f1c83fd7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_CatalogImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json
deleted file mode 100644
index b2b0b3965429a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogImportExport/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-import-export",
-    "description": "Magento 2 Functional Test Module Catalog Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CatalogImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/README.md
deleted file mode 100644
index 512a5f319fed4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CatalogInventory** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json
deleted file mode 100644
index 432acba351bc3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogInventory/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-inventory",
-    "description": "Magento 2 Functional Test Module Catalog Inventory",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogInventory\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CatalogInventory"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/README.md
deleted file mode 100644
index 5c67ac5b0ba9c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CatalogRule** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json
deleted file mode 100644
index 49b2aeb653fb1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRule/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-rule",
-    "description": "Magento 2 Functional Test Module Catalog Rule",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogRule\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CatalogRule"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/README.md
deleted file mode 100644
index ed2796d211d25..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CatalogRuleConfigurable** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json
deleted file mode 100644
index 62be67eaed6da..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-rule-configurable",
-    "description": "Magento 2 Functional Test Module Catalog Rule Configurable",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogRuleConfigurable\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CatalogRuleConfigurable"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/README.md
deleted file mode 100644
index 092e7bc142598..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CatalogSearch** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json
deleted file mode 100644
index 65e7b9c781e61..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/composer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-search",
-    "description": "Magento 2 Functional Test Module Catalog Search",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-search": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogSearch\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CatalogSearch"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/README.md
deleted file mode 100644
index 7329f664baa03..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_CatalogUrlRewrite** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json
deleted file mode 100644
index a6b42de511466..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogUrlRewrite/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-url-rewrite",
-    "description": "Magento 2 Functional Test Module Catalog Url Rewrite",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-url-rewrite": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogUrlRewrite\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CatalogUrlRewrite"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/README.md
deleted file mode 100644
index 43aa796462c76..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CatalogWidget** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json
deleted file mode 100644
index 5550db57606ba..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogWidget/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-catalog-widget",
-    "description": "Magento 2 Functional Test Module Catalog Widget",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev",
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CatalogWidget\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CatalogWidget"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/README.md
deleted file mode 100644
index fc63b2f394813..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Checkout** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json
deleted file mode 100644
index 130cd79c8d5ef..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/composer.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-checkout",
-    "description": "Magento 2 Functional Test Module Checkout",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "~2.0.0",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-msrp": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Checkout\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Checkout"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/README.md
deleted file mode 100644
index 35423659f629f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CheckoutAgreements** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json
deleted file mode 100644
index fe061803b297b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CheckoutAgreements/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-checkout-agreements",
-    "description": "Magento 2 Functional Test Module Checkout Agreements",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CheckoutAgreements\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CheckoutAgreements"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/README.md
deleted file mode 100644
index d1214efec9128..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Cms** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json
deleted file mode 100644
index 07aa529e45e14..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-cms",
-    "description": "Magento 2 Functional Test Module Cms",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-variable": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Cms\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Cms"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/README.md
deleted file mode 100644
index cc52700eba988..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CmsUrlRewrite** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json
deleted file mode 100644
index 7c35ddafd671d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CmsUrlRewrite/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-cms-url-rewrite",
-    "description": "Magento 2 Functional Test Module Cms Url Rewrite",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-url-rewrite": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CmsUrlRewrite\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CmsUrlRewrite"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/README.md
deleted file mode 100644
index eb0b57b2886f2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Config** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json
deleted file mode 100644
index 4f3c721c582b1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-config",
-    "description": "Magento 2 Functional Test Module Config",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cron": "100.0.0-dev",
-        "magento/magento2-functional-test-module-deploy": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Config\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Config"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/README.md
deleted file mode 100644
index 1cf979955a3cd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ConfigurableImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json
deleted file mode 100644
index 2d8699d4999d5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableImportExport/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-configurable-import-export",
-    "description": "Magento 2 Functional Test Module Configurable Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ConfigurableImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/ConfigurableImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/README.md
deleted file mode 100644
index 3db572028f728..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ConfigurableProduct** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json
deleted file mode 100644
index e9f74ef5ddbc6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/composer.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-configurable-product",
-    "description": "Magento 2 Functional Test Module Configurable Product",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-msrp": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ConfigurableProduct\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/ConfigurableProduct"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/README.md
deleted file mode 100644
index ebd5a01b14fa9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ConfigurableProductSales** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json
deleted file mode 100644
index 629ead23ae981..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductSales/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-configurable-product-sales",
-    "description": "Magento 2 Functional Test Module Configurable Product Sales",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ConfigurableProductSales\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/ConfigurableProductSales"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/README.md
deleted file mode 100644
index 1baafbefac03a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Contact** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json
deleted file mode 100644
index b77a865b04de1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Contact/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-contact",
-    "description": "Magento 2 Functional Test Module Contact",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Contact\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Contact"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/README.md
deleted file mode 100644
index ed80d8f232ca7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Cookie** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json
deleted file mode 100644
index 4d55d54479092..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cookie/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-cookie",
-    "description": "Magento 2 Functional Test Module Cookie",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Cookie\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Cookie"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/README.md
deleted file mode 100644
index a3394b9a18177..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Cron** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json
deleted file mode 100644
index ad913508c5cbb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cron/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-cron",
-    "description": "Magento 2 Functional Test Module Cron",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Cron\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Cron"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/README.md
deleted file mode 100644
index e5e9c0458b1b6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CurrencySymbol** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json
deleted file mode 100644
index 335cee4939672..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CurrencySymbol/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-currency-symbol",
-    "description": "Magento 2 Functional Test Module Currency Symbol",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CurrencySymbol\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CurrencySymbol"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/README.md
deleted file mode 100644
index cb51dcef8c48e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Customer** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json
deleted file mode 100644
index e6e178fbcd163..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/composer.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-customer",
-    "description": "Magento 2 Functional Test Module Customer",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-integration": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-newsletter": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-review": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Customer\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Customer"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/README.md
deleted file mode 100644
index ad6ab29c57026..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_CustomerAnalytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json
deleted file mode 100644
index 6082e25ee87ac..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-customer-analytics",
-    "description": "Magento 2 Acceptance Test Module Customer Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CustomerAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CustomerAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/README.md
deleted file mode 100644
index ebeb51bf1e4f2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_CustomerImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json
deleted file mode 100644
index 09caca0289949..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CustomerImportExport/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-customer-import-export",
-    "description": "Magento 2 Functional Test Module Customer Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\CustomerImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/CustomerImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/README.md
deleted file mode 100644
index 20704cfd90ce6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Deploy** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json
deleted file mode 100644
index 6cc25c9975ac9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Deploy/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-deploy",
-    "description": "Magento 2 Functional Test Module Deploy",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-require-js": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-user": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Deploy\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Deploy"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/README.md
deleted file mode 100644
index 4aff70291bbf6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Developer** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json
deleted file mode 100644
index d20bf30c17289..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Developer/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-developer",
-    "description": "Magento 2 Functional Test Module Developer",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Developer\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Developer"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/README.md
deleted file mode 100644
index bda156c74e0ca..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Dhl** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json
deleted file mode 100644
index 9d2da35038bfe..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Dhl/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-dhl",
-    "description": "Magento 2 Functional Test Module Dhl",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Dhl\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Dhl"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/README.md
deleted file mode 100644
index b028b5b4c9ca5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Directory** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json
deleted file mode 100644
index 8262f404e93a3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Directory/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-directory",
-    "description": "Magento 2 Functional Test Module Directory",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Directory\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Directory"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/README.md
deleted file mode 100644
index cf2e356526c00..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Downloadable** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json
deleted file mode 100644
index 16f9f02ac24a4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Downloadable/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-downloadable",
-    "description": "Magento 2 Functional Test Module Downloadable",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-gift-message": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Downloadable\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Downloadable"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/README.md
deleted file mode 100644
index 7edcc4ffcb395..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_DownloadableImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json
deleted file mode 100644
index 2c3b8fd9ce566..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/DownloadableImportExport/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-downloadable-import-export",
-    "description": "Magento 2 Functional Test Module Downloadable Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-downloadable": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\DownloadableImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/DownloadableImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/README.md
deleted file mode 100644
index 23724b09bd2cf..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Eav** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json
deleted file mode 100644
index 06db9b63d7387..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Eav/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-eav",
-    "description": "Magento 2 Functional Test Module Eav",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Eav\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Eav"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/README.md
deleted file mode 100644
index dab22d5d01827..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Elasticsearch** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/composer.json
deleted file mode 100644
index c6f85999d3dea..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-elasticsearch",
-    "description": "Magento 2 Functional Test Module Elasticsearch",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "proprietary"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-advanced-search": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-search": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-search": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Elasticsearch\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/README.md
deleted file mode 100644
index 413b1bcbbb525..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Email** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json
deleted file mode 100644
index e95fc4ca907e3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Email/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-email",
-    "description": "Magento 2 Functional Test Module Email",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-variable": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Email\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Email"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/README.md
deleted file mode 100644
index 61aa9a448b743..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_EncryptionKey** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json
deleted file mode 100644
index 0252e03b31808..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/EncryptionKey/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-encryption-key",
-    "description": "Magento 2 Functional Test Module Encryption Key",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\EncryptionKey\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/EncryptionKey"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/README.md
deleted file mode 100644
index 93d1828ef4ccd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Fedex** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json
deleted file mode 100644
index 5cf3ea9132e2a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Fedex/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-fedex",
-    "description": "Magento 2 Functional Test Module Fedex",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Fedex\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Fedex"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/README.md
deleted file mode 100644
index 49fd114a43a24..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GiftMessage** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json
deleted file mode 100644
index 5cc515e5922d9..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GiftMessage/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-gift-message",
-    "description": "Magento 2 Functional Test Module Gift Message",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GiftMessage\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/GiftMessage"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/README.md
deleted file mode 100644
index 6e3595cd366c6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GoogleAdwords** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json
deleted file mode 100644
index 8710e25cd469d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAdwords/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-google-adwords",
-    "description": "Magento 2 Functional Test Module Google Adwords",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GoogleAdwords\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/GoogleAdwords"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/README.md
deleted file mode 100644
index 0fa9dbd614ae7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GoogleAnalytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json
deleted file mode 100644
index 63b7597a9d391..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleAnalytics/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-google-analytics",
-    "description": "Magento 2 Functional Test Module Google Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-cookie": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GoogleAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/GoogleAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/README.md
deleted file mode 100644
index 9bdf02b6170ed..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GoogleOptimizer** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json
deleted file mode 100644
index 71d48969544e3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GoogleOptimizer/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-google-optimizer",
-    "description": "Magento 2 Functional Test Module Google Optimizer",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-google-analytics": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GoogleOptimizer\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/GoogleOptimizer"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/README.md
deleted file mode 100644
index 1f48eef7f97a7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GraphQl** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json
deleted file mode 100644
index 701ed734f896c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GraphQl/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-graph-ql",
-    "description": "Magento 2 Functional Test Module Graph Ql",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-webapi": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GraphQl\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/GraphQl"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/README.md
deleted file mode 100644
index 36fb828bbdff7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_GroupedImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json
deleted file mode 100644
index 4460aef0ac60f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedImportExport/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-grouped-import-export",
-    "description": "Magento 2 Functional Test Module Grouped Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-grouped-product": "100.0.0-dev",
-        "magento/magento2-functional-test-module-import-export": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GroupedImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/GroupedImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/README.md
deleted file mode 100644
index edf1e0dc3d2f5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_GroupedProduct** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json
deleted file mode 100644
index ddc23e730436d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/GroupedProduct/composer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-grouped-product",
-    "description": "Magento 2 Functional Test Module Grouped Product",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-msrp": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\GroupedProduct\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/GroupedProduct"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/README.md
deleted file mode 100644
index b762f5fb7351c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ImportExport** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json
deleted file mode 100644
index 4632adb4f904f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ImportExport/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-import-export",
-    "description": "Magento 2 Functional Test Module Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/ImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/README.md
deleted file mode 100644
index 21212a0fed31e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Indexer** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json
deleted file mode 100644
index 35b8219186bd2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Indexer/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-indexer",
-    "description": "Magento 2 Functional Test Module Indexer",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Indexer\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Indexer"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/README.md
deleted file mode 100644
index 9975174d27ee7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_InstantPurchase** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json
deleted file mode 100644
index 84c595020968c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/InstantPurchase/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-instant-purchase",
-    "description": "Magento 2 Functional Test Module Instant Purchase",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-vault": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\InstantPurchase\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/InstantPurchase"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/README.md
deleted file mode 100644
index 2f024c81e5141..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Integration** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json
deleted file mode 100644
index 9f0ccb76c1cd3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Integration/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-integration",
-    "description": "Magento 2 Functional Test Module Integration",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-security": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-user": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Integration\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Integration"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/README.md
deleted file mode 100644
index 6c864b9f5eedd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_LayeredNavigation** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json
deleted file mode 100644
index 447f3ba38a06c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/LayeredNavigation/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-layered-navigation",
-    "description": "Magento 2 Functional Test Module Layered Navigation",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\LayeredNavigation\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/LayeredNavigation"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/README.md
deleted file mode 100644
index 5c744ec36f1be..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Marketplace** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json
deleted file mode 100644
index d4079dfefc9ba..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Marketplace/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-marketplace",
-    "description": "Magento 2 Functional Test Module Marketplace",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Marketplace\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Marketplace"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/README.md
deleted file mode 100644
index ee885969bb127..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_MediaStorage** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json
deleted file mode 100644
index 29657d03014bf..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MediaStorage/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-media-storage",
-    "description": "Magento 2 Functional Test Module Media Storage",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\MediaStorage\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/MediaStorage"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/README.md
deleted file mode 100644
index 900e136684513..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_MessageQueue** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/composer.json
deleted file mode 100644
index 10ae24c3b5448..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-message-queue",
-    "description": "Magento 2 Functional Test Module Message Queue",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "proprietary"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\MessageQueue\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/README.md
deleted file mode 100644
index 1a97c33f497a5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_Msrp** Module.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json
deleted file mode 100644
index b91aaddcba3f2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Msrp/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-msrp",
-    "description": "Magento 2 Functional Test Module Msrp",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-downloadable": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-grouped-product": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Msrp\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Msrp"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/README.md
deleted file mode 100644
index b6e1b54d6ac6e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Multishipping** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json
deleted file mode 100644
index ffd80908ed522..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Multishipping/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-multishipping",
-    "description": "Magento 2 Functional Test Module Multishipping",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Multishipping\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Multishipping"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/README.md
deleted file mode 100644
index a20eb0010356d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_MysqlMq** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/composer.json
deleted file mode 100644
index a647b1d6249a3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/composer.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-mysql-mq",
-    "description": "Magento 2 Functional Test Module Mysql Mq",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "proprietary"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\MysqlMq\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/README.md
deleted file mode 100644
index c6d4c6906be90..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_NewRelicReporting** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json
deleted file mode 100644
index c6b60c43b6de0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/NewRelicReporting/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-new-relic-reporting",
-    "description": "Magento 2 Functional Test Module New Relic Reporting",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\NewRelicReporting\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/NewRelicReporting"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/README.md
deleted file mode 100644
index 95a365b8b8f79..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Newsletter** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json
deleted file mode 100644
index eff14e85b04a0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-newsletter",
-    "description": "Magento 2 Functional Test Module Newsletter",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-require-js": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Newsletter\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Newsletter"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/README.md
deleted file mode 100644
index ba6e5c9680dbd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_OfflinePayments** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json
deleted file mode 100644
index f645c45abfdd0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflinePayments/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-offline-payments",
-    "description": "Magento 2 Functional Test Module Offline Payments",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\OfflinePayments\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/OfflinePayments"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/README.md
deleted file mode 100644
index 42a12e4398e4f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_OfflineShipping** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json
deleted file mode 100644
index 2fc319facc683..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/OfflineShipping/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-offline-shipping",
-    "description": "Magento 2 Functional Test Module Offline Shipping",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\OfflineShipping\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/OfflineShipping"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/README.md
deleted file mode 100644
index 8db3000b9408a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_PageCache** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json
deleted file mode 100644
index 2c4612b71a126..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageCache/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-page-cache",
-    "description": "Magento 2 Functional Test Module Page Cache",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\PageCache\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/PageCache"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/README.md
deleted file mode 100644
index 7a8fcc6210c9e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Payment** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json
deleted file mode 100644
index ea5f918171c8f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Payment/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-payment",
-    "description": "Magento 2 Functional Test Module Payment",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Payment\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Payment"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/README.md
deleted file mode 100644
index 820d3acc2e101..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Paypal** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json
deleted file mode 100644
index 94c3af772673e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Paypal/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-paypal",
-    "description": "Magento 2 Functional Test Module Paypal",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-instant-purchase": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-vault": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Paypal\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Paypal"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/README.md
deleted file mode 100644
index 690db182dcb4f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Persistent** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json
deleted file mode 100644
index e12542a65d2be..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Persistent/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-persistent",
-    "description": "Magento 2 Functional Test Module Persistent",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cron": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Persistent\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Persistent"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/README.md
deleted file mode 100644
index 1a78d82877b01..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ProductAlert** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json
deleted file mode 100644
index 1dc3837e4b1fb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductAlert/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-product-alert",
-    "description": "Magento 2 Functional Test Module Product Alert",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ProductAlert\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/ProductAlert"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/README.md
deleted file mode 100644
index 0a19d3a9d1e60..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_ProductVideo** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json
deleted file mode 100644
index 40d03272a3292..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ProductVideo/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-product-video",
-    "description": "Magento 2 Functional Test Module Product Video",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ProductVideo\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/ProductVideo"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/README.md
deleted file mode 100644
index 17b0bf4c60516..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Quote** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json
deleted file mode 100644
index 7d3a16063745f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Quote/composer.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-quote",
-    "description": "Magento 2 Functional Test Module Quote",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-sequence": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Quote\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Quote"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/README.md
deleted file mode 100644
index 7460ca6a7dffb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_QuoteAnalytics** Module.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json
deleted file mode 100644
index 0d249b0c40921..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/QuoteAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-quote-analytics",
-    "description": "Magento 2 Acceptance Test Module Quote Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\QuoteAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/QuoteAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/README.md
deleted file mode 100644
index d2bcbe81339ad..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Reports** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json
deleted file mode 100644
index 53d7e7b1c9c0e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Reports/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-reports",
-    "description": "Magento 2 Functional Test Module Reports",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-downloadable": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-review": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev",
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Reports\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Reports"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/README.md
deleted file mode 100644
index 64e6b0ef6e139..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_RequireJs** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json
deleted file mode 100644
index 2fcf3dc4c6103..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/RequireJs/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-require-js",
-    "description": "Magento 2 Functional Test Module Require Js",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\RequireJs\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/RequireJs"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/README.md
deleted file mode 100644
index 71b1cdc87d9d6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Review** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json
deleted file mode 100644
index 4445be9e856cf..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Review/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-review",
-    "description": "Magento 2 Functional Test Module Review",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-newsletter": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Review\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Review"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/README.md
deleted file mode 100644
index 3f50f5341cfd4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_ReviewAnalytics** Module.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json
deleted file mode 100644
index d58c62a68dac5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ReviewAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-review-analytics",
-    "description": "Magento 2 Acceptance Test Module Review Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-review": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\ReviewAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/ReviewAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/README.md
deleted file mode 100644
index 87ea94e0f1d23..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Robots** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json
deleted file mode 100644
index 70cf4ba3203e4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Robots/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-robots",
-    "description": "Magento 2 Functional Test Module Robots",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Robots\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Robots"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/README.md
deleted file mode 100644
index 5002c878c2e54..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Rss** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json
deleted file mode 100644
index 9fa6d370cd610..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rss/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-rss",
-    "description": "Magento 2 Functional Test Module Rss",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Rss\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Rss"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/README.md
deleted file mode 100644
index a797fd63dc668..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Rule** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json
deleted file mode 100644
index 73dd74c5fa576..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Rule/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-rule",
-    "description": "Magento 2 Functional Test Module Rule",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Rule\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Rule"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/README.md
deleted file mode 100644
index dbaf12404d157..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Sales** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json
deleted file mode 100644
index c339cb1cea0c1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/composer.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sales",
-    "description": "Magento 2 Functional Test Module Sales",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-gift-message": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-reports": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales-sequence": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev",
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Sales\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Sales"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/README.md
deleted file mode 100644
index 856eb7057f031..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_SalesAnalytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json
deleted file mode 100644
index 3f96160f374d0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sales-analytics",
-    "description": "Magento 2 Acceptance Test Module Sales Analytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SalesAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/SalesAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/README.md
deleted file mode 100644
index beeef87b6e7fd..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SalesInventory** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json
deleted file mode 100644
index 6547bff428193..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesInventory/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sales-inventory",
-    "description": "Magento 2 Functional Test Module Sales Inventory",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SalesInventory\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/SalesInventory"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/README.md
deleted file mode 100644
index 2180f41bb7e31..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SalesRule** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json
deleted file mode 100644
index 990fdc0201930..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesRule/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sales-rule",
-    "description": "Magento 2 Functional Test Module Sales Rule",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "~2.0.0",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-reports": "100.0.0-dev",
-        "magento/magento2-functional-test-module-rule": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SalesRule\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/SalesRule"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/README.md
deleted file mode 100644
index 8b3e36c3fda04..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SalesSequence** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json
deleted file mode 100644
index 808f1394d6173..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SalesSequence/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sales-sequence",
-    "description": "Magento 2 Functional Test Module Sales Sequence",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SalesSequence\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/SalesSequence"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/README.md
deleted file mode 100644
index 1dcde417aed6f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SampleData** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json
deleted file mode 100644
index ed12f8bda3beb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleData/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sample-data",
-    "description": "Magento 2 Functional Test Module Sample Data",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SampleData\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/SampleData"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/README.md
deleted file mode 100644
index bb6c6d52df27d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Search** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json
deleted file mode 100644
index 436bc7d1c4e3f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Search/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-search",
-    "description": "Magento 2 Functional Test Module Search",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "~2.0.0",
-        "magento/magento2-functional-test-module-catalog-search": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-reports": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Search\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Search"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/README.md
deleted file mode 100644
index 26f535867d4bc..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Security** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json
deleted file mode 100644
index 69f18fcfbc40f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Security/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-security",
-    "description": "Magento 2 Functional Test Module Security",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Security\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Security"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/README.md
deleted file mode 100644
index 8759f1b780d3b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SendFriend** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json
deleted file mode 100644
index 0b7d03fa71fa7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SendFriend/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-send-friend",
-    "description": "Magento 2 Functional Test Module Send Friend",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SendFriend\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/SendFriend"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/README.md
deleted file mode 100644
index 2e2ca0df9eaa6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Shipping** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json
deleted file mode 100644
index fbe922ddc2d5c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Shipping/composer.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-shipping",
-    "description": "Magento 2 Functional Test Module Shipping",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-contact": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-user": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Shipping\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Shipping"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/README.md
deleted file mode 100644
index 9770ead78032c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Sitemap** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json
deleted file mode 100644
index 6d1c9eb72dab4..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sitemap/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-sitemap",
-    "description": "Magento 2 Functional Test Module Sitemap",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-robots": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Sitemap\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Sitemap"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/README.md
deleted file mode 100644
index 409824ff7bfc3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Store** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json
deleted file mode 100644
index 718efc04391ca..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-store",
-    "description": "Magento 2 Functional Test Module Store",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Store\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Store"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/README.md
deleted file mode 100644
index b9ad9db966882..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Swagger** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json
deleted file mode 100644
index b9460ce939e86..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swagger/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-swagger",
-    "description": "Magento 2 Functional Test Module Swagger",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Swagger\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Swagger"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/README.md
deleted file mode 100644
index c117f0005c6b1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Swatches** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json
deleted file mode 100644
index 9632be9c9f172..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Swatches/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-swatches",
-    "description": "Magento 2 Functional Test Module Swatches",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Swatches\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Swatches"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/README.md
deleted file mode 100644
index 5f25de111faa6..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_SwatchesLayeredNavigation** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json
deleted file mode 100644
index 0931a3c286d0a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-swatches-layered-navigation",
-    "description": "Magento 2 Functional Test Module Swatches Layered Navigation",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\SwatchesLayeredNavigation\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/SwatchesLayeredNavigation"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/README.md
deleted file mode 100644
index 0b2f50e217b0b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Tax** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json
deleted file mode 100644
index 9a39b2518fe43..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tax/composer.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-tax",
-    "description": "Magento 2 Functional Test Module Tax",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-reports": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Tax\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Tax"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/README.md
deleted file mode 100644
index dbbed298fe61c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_TaxImportExport** Module.
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json
deleted file mode 100644
index 364981ffd1e95..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/TaxImportExport/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-tax-import-export",
-    "description": "Magento 2 Functional Test Module Tax Import Export",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\TaxImportExport\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/TaxImportExport"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/README.md
deleted file mode 100644
index d52ba3a230431..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Theme** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json
deleted file mode 100644
index 568b31e090ca2..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Theme/composer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-theme",
-    "description": "Magento 2 Functional Test Module Theme",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "~2.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
-        "magento/magento2-functional-test-module-require-js": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Theme\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Theme"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/README.md
deleted file mode 100644
index a9412ea9d26b8..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Tinemce3** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/composer.json
deleted file mode 100644
index 7bccbdd2b1b3d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Tinymce3/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-tinymce-3",
-    "description": "Magento 2 Functional Test Module Theme",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "~2.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev",
-        "magento/magento2-functional-test-module-variable": "100.0.0-dev",
-        "magento/magento2-functional-test-module-widget": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Theme\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Theme"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/README.md
deleted file mode 100644
index 4f3da0b95f39d..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Translation** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json
deleted file mode 100644
index 3a0fb712810ad..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Translation/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-translation",
-    "description": "Magento 2 Functional Test Module Translation",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-developer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Translation\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Translation"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/README.md
deleted file mode 100644
index 0e654f6aa5e8f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Ui** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json
deleted file mode 100644
index 219f938fed196..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-ui",
-    "description": "Magento 2 Functional Test Module Ui",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-user": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Ui\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Ui"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/README.md
deleted file mode 100644
index 3a7f99729cad3..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Ups** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json
deleted file mode 100644
index 11aea7bbc68b7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ups/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-ups",
-    "description": "Magento 2 Functional Test Module Ups",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Ups\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Ups"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/README.md
deleted file mode 100644
index 645ff970002a1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_UrlRewrite** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json
deleted file mode 100644
index d88d9a54264ee..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/UrlRewrite/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-url-rewrite",
-    "description": "Magento 2 Functional Test Module Url Rewrite",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms-url-rewrite": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\UrlRewrite\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/UrlRewrite"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/README.md
deleted file mode 100644
index 77e18cd31e81b..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_User** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json
deleted file mode 100644
index 07c2ed3745de5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-user",
-    "description": "Magento 2 Functional Test Module User",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-integration": "100.0.0-dev",
-        "magento/magento2-functional-test-module-security": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\User\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/User"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/README.md
deleted file mode 100644
index 0f87c957487ef..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Usps** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json
deleted file mode 100644
index 5896bff636205..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Usps/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-usps",
-    "description": "Magento 2 Functional Test Module Usps",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-config": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-shipping": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Usps\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Usps"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/README.md
deleted file mode 100644
index 9c847f4db2bdb..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Variable** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json
deleted file mode 100644
index d70e75da77a03..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Variable/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-variable",
-    "description": "Magento 2 Functional Test Module Variable",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Variable\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Variable"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/README.md
deleted file mode 100644
index 9edda871be550..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Vault** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json
deleted file mode 100644
index 88ce9046df10c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Vault/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-vault",
-    "description": "Magento 2 Functional Test Module Vault",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-payment": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Vault\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Vault"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/README.md
deleted file mode 100644
index ba933541be888..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Version** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json
deleted file mode 100644
index 8a256bc40d42a..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Version/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-version",
-    "description": "Magento 2 Functional Test Module Version",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Version\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Version"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/README.md
deleted file mode 100644
index bb843ce718556..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Webapi** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json
deleted file mode 100644
index a00dbd244615f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Webapi/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-webapi",
-    "description": "Magento 2 Functional Test Module Webapi",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-authorization": "100.0.0-dev",
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-integration": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Webapi\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Webapi"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/README.md
deleted file mode 100644
index 25f93d6962924..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_WebapiSecurity** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json
deleted file mode 100644
index 3c26635fc3f6e..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WebapiSecurity/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-webapi-security",
-    "description": "Magento 2 Functional Test Module Webapi Security",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-webapi": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\WebapiSecurity\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/WebapiSecurity"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/README.md
deleted file mode 100644
index 4f199873079e5..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Weee** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json
deleted file mode 100644
index b226f2b1697fa..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Weee/composer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-weee",
-    "description": "Magento 2 Functional Test Module Weee",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "magento/magento2-functional-test-module-directory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-eav": "100.0.0-dev",
-        "magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
-        "magento/magento2-functional-test-module-quote": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-tax": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Weee\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Weee"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/README.md
deleted file mode 100644
index 2a8996c2f3322..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Widget** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json
deleted file mode 100644
index 85c1d19bd696c..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Widget/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-widget",
-    "description": "Magento 2 Functional Test Module Widget",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-cms": "100.0.0-dev",
-        "magento/magento2-functional-test-module-email": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-theme": "100.0.0-dev",
-        "magento/magento2-functional-test-module-variable": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Widget\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Widget"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/README.md
deleted file mode 100644
index d5b0902bd9cb0..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Functional Tests
-
-The Functional Tests Module for **Magento_Wishlist** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json
deleted file mode 100644
index 9f1358b3ec8b7..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/composer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-wishlist",
-    "description": "Magento 2 Functional Test Module Wishlist",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "magento/magento2-functional-test-module-catalog": "100.0.0-dev",
-        "magento/magento2-functional-test-module-checkout": "100.0.0-dev",
-        "magento/magento2-functional-test-module-customer": "100.0.0-dev",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-backend": "100.0.0-dev",
-        "magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
-        "magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
-        "magento/magento2-functional-test-module-rss": "100.0.0-dev",
-        "magento/magento2-functional-test-module-sales": "100.0.0-dev",
-        "magento/magento2-functional-test-module-store": "100.0.0-dev",
-        "magento/magento2-functional-test-module-ui": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\Wishlist\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/Wishlist"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/README.md
deleted file mode 100644
index a9826ff12fbd1..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Magento 2 Acceptance Tests
-
-The Acceptance Tests Module for **Magento_WishlistAnalytics** Module.
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json
deleted file mode 100644
index 1f25efea7f90f..0000000000000
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/WishlistAnalytics/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "magento/magento2-functional-test-module-wishlist-analytics",
-    "description": "Magento 2 Acceptance Test Module WishlistAnalytics",
-    "type": "magento2-test-module",
-    "version": "100.0.0-dev",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "config": {
-        "sort-packages": true
-    },
-    "require": {
-        "magento/magento2-functional-testing-framework": "1.0.0",
-        "php": "~7.1.3||~7.2.0"
-    },
-    "suggest": {
-        "magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\FunctionalTest\\WishlistAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "map": [
-            [
-                "*",
-                "tests/functional/Magento/FunctionalTest/WishlistAnalytics"
-            ]
-        ]
-    }
-}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php
index 5877ee5cbcc48..69443544febfd 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php
@@ -108,7 +108,8 @@ private function _filterSpecialCases(&$files)
             '#layout/swagger_index_index.xml$#',
             '#Doc/etc/doc/vars.xml$#',
             '#phpunit.xml$#',
-            '#etc/db_schema.xml$#'
+            '#etc/db_schema.xml$#',
+            '#Test/Mftf#',
         ];
         foreach ($list as $pattern) {
             foreach ($files as $key => $value) {

From 5415aa1f1278ababc3990aff3d01b37a8a467853 Mon Sep 17 00:00:00 2001
From: Platform Team <platform.team@vaimo.com>
Date: Mon, 18 Jun 2018 13:38:08 +0200
Subject: [PATCH 123/127] Setting deploy mode to production with
 --skip-compilation flag should not clear generated code

---
 setup/src/Magento/Setup/Console/CompilerPreparation.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Console/CompilerPreparation.php b/setup/src/Magento/Setup/Console/CompilerPreparation.php
index 9ea938d51fb37..c39c721b61716 100644
--- a/setup/src/Magento/Setup/Console/CompilerPreparation.php
+++ b/setup/src/Magento/Setup/Console/CompilerPreparation.php
@@ -105,7 +105,6 @@ private function getCompilerInvalidationCommands()
             'module:disable',
             'module:enable',
             'module:uninstall',
-            'deploy:mode:set'
         ];
     }
 

From 70aab5e64b9b0677e8ba62c1f441a19a62bc208a Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Fri, 6 Jul 2018 12:55:28 +0300
Subject: [PATCH 124/127] MC-2338: 3rd party library/dependency upgrade for 2.3
 pre Alpha

---
 .../Command/DevTestsRunCommandTest.php        | 120 +++++++++++++-----
 1 file changed, 85 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
index 862cdc336b803..8ccf66fdd39d5 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
@@ -4,50 +4,100 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Developer\Test\Unit\Console\Command;
+// @codingStandardsIgnoreStart
 
-use Magento\Developer\Console\Command\DevTestsRunCommand;
-use Symfony\Component\Console\Tester\CommandTester;
+namespace Magento\Developer\Console\Command {
+    use Symfony\Component\Console\Tester\CommandTester;
 
-/**
- * Class DevTestsRunCommandTest
- *
- * Tests dev:tests:run command.  Only tests error case because DevTestsRunCommand calls phpunit with
- * passthru, so there is no good way to mock out running the tests.
- */
-class DevTestsRunCommandTest extends \PHPUnit\Framework\TestCase
-{
+    $devTestsRunCommandTestPassthruReturnVar = null;
 
     /**
-     * @var DevTestsRunCommand
+     * Mock for PHP builtin passthtru function
+     *
+     * @param string $command
+     * @param int|null $return_var
+     * @return void
      */
-    private $command;
-
-    protected function setUp()
+    function passthru($command, &$return_var = null)
     {
-        $this->command = new DevTestsRunCommand();
+        global $devTestsRunCommandTestPassthruReturnVar;
+        $return_var = $devTestsRunCommandTestPassthruReturnVar;
     }
 
-    public function testExecuteBadType()
+    /**
+     * Class DevTestsRunCommandTest
+     *
+     * Tests dev:tests:run command.  Only tests error case because DevTestsRunCommand calls phpunit with
+     * passthru, so there is no good way to mock out running the tests.
+     */
+    class DevTestsRunCommandTest extends \PHPUnit\Framework\TestCase
     {
-        $commandTester = new CommandTester($this->command);
-        $commandTester->execute([DevTestsRunCommand::INPUT_ARG_TYPE => 'bad']);
-        $this->assertContains('Invalid type: "bad"', $commandTester->getDisplay());
-    }
 
-    public function testPassArgumentsToPHPUnit()
-    {
-        $commandTester = new CommandTester($this->command);
-        $commandTester->execute(
-            [
-                DevTestsRunCommand::INPUT_ARG_TYPE                    => 'unit',
-                '-' . DevTestsRunCommand::INPUT_OPT_COMMAND_ARGUMENTS_SHORT => '--list-suites',
-            ]
-        );
-        $this->assertContains(
-            'phpunit  --list-suites',
-            $commandTester->getDisplay(),
-            'Parameters should be passed to PHPUnit'
-        );
+        /**
+         * @var DevTestsRunCommand
+         */
+        private $command;
+
+        protected function setUp()
+        {
+            $this->command = new DevTestsRunCommand();
+        }
+
+        public function testExecuteBadType()
+        {
+            $commandTester = new CommandTester($this->command);
+            $commandTester->execute([DevTestsRunCommand::INPUT_ARG_TYPE => 'bad']);
+            $this->assertContains('Invalid type: "bad"', $commandTester->getDisplay());
+        }
+
+        public function testPassArgumentsToPHPUnit()
+        {
+            global $devTestsRunCommandTestPassthruReturnVar;
+
+            $devTestsRunCommandTestPassthruReturnVar = 0;
+
+            $commandTester = new CommandTester($this->command);
+            $commandTester->execute(
+                [
+                    DevTestsRunCommand::INPUT_ARG_TYPE => 'unit',
+                    '-' . DevTestsRunCommand::INPUT_OPT_COMMAND_ARGUMENTS_SHORT => '--list-suites',
+                ]
+            );
+            $this->assertContains(
+                'phpunit  --list-suites',
+                $commandTester->getDisplay(),
+                'Parameters should be passed to PHPUnit'
+            );
+            $this->assertContains(
+                'PASSED (',
+                $commandTester->getDisplay(),
+                'PHPUnit runs should have passed'
+            );
+        }
+
+        public function testPassArgumentsToPHPUnitNegative()
+        {
+            global $devTestsRunCommandTestPassthruReturnVar;
+
+            $devTestsRunCommandTestPassthruReturnVar = 255;
+
+            $commandTester = new CommandTester($this->command);
+            $commandTester->execute(
+                [
+                    DevTestsRunCommand::INPUT_ARG_TYPE => 'unit',
+                    '-' . DevTestsRunCommand::INPUT_OPT_COMMAND_ARGUMENTS_SHORT => '--list-suites',
+                ]
+            );
+            $this->assertContains(
+                'phpunit  --list-suites',
+                $commandTester->getDisplay(),
+                'Parameters should be passed to PHPUnit'
+            );
+            $this->assertContains(
+                'FAILED - ',
+                $commandTester->getDisplay(),
+                'PHPUnit runs should have passed'
+            );
+        }
     }
 }

From 1480d23acb023df93ac8e899d1277ee982ce6dda Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Fri, 6 Jul 2018 16:40:07 +0300
Subject: [PATCH 125/127] ENGCOM-1312: [Improvement] Implement customer group
 grid on ui component #13501

---
 .../Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
index 298d5bbf5c6bf..7722645b3fde3 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Group/CustomerGroupGrid.php
@@ -31,6 +31,10 @@ class CustomerGroupGrid extends DataGrid
         'code' => [
             'selector' => '.admin__data-grid-filters input[name*=customer_group_code]',
         ],
+        'tax_class_id' => [
+            'selector' => '.admin__data-grid-filters select[name*=tax_class_id]',
+            'input' => 'select'
+        ],
     ];
 
     /**

From 9bcb9872a62e31745ec9135b2ecfc147fbab7df0 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@magento.com>
Date: Fri, 6 Jul 2018 17:27:52 +0300
Subject: [PATCH 126/127] MC-2338: 3rd party library/dependency upgrade for 2.3
 pre Alpha

---
 .../Test/Unit/Console/Command/DevTestsRunCommandTest.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
index 8ccf66fdd39d5..dcd79cc0521a0 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
@@ -17,6 +17,7 @@
      * @param string $command
      * @param int|null $return_var
      * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     function passthru($command, &$return_var = null)
     {

From 540a6afcaf859090f8fa0e3b99a28b98feb0b06c Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Sat, 7 Jul 2018 13:25:23 +0300
Subject: [PATCH 127/127] ENGCOM-1312: [Improvement] Implement customer group
 grid on ui component #13501

---
 .../Customer/Ui/Component/Listing/Column/GroupActions.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
index 4e6d8c70923ac..a8a3429ebadb0 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
@@ -28,12 +28,12 @@ class GroupActions extends Column
     /**
      * @var UrlInterface
      */
-    protected $urlBuilder;
+    private $urlBuilder;
 
     /**
      * @var Escaper
      */
-    protected $escaper;
+    private $escaper;
 
     /**
      * Constructor