diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/BlockGallery.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/BlockGallery.php
index 53f1f12ece65c73fb572cd972a6718f1a1f7b306..bc1a0ebc4ce1501ab3e322c16e84a09f909e6fd0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/BlockGallery.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/BlockGallery.php
@@ -23,7 +23,7 @@ class BlockGallery extends Section
     public function setFieldsData(array $data, SimpleElement $element = null)
     {
         if (isset($data['image'])) {
-            foreach ($data['image']['value'] as $key => $imageData) {
+            foreach ($data['image']['value'] as $imageData) {
                 $uploadElement = $this->_rootElement->find('[name="image"]', Locator::SELECTOR_CSS, 'upload');
                 $uploadElement->setValue($imageData['file']);
                 $this->waitForElementNotVisible('.image.image-placeholder .file-row');
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCanUpdate.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCanUpdate.php
index f126fef2a2dcdc595b1ef2eb22de04e6877b63a4..24f1f9d7714cc0b4031bd0586321cbb0e7ae92ef 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCanUpdate.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCanUpdate.php
@@ -17,6 +17,7 @@ class AssertProductCanUpdate extends \Magento\Mtf\Constraint\AbstractConstraint
      * @param \Magento\Mtf\Fixture\FixtureInterface $product
      * @param \Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit $catalogProductEdit
      * @param \Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex $catalogProductIndex
+     * @return void
      */
     public function processAssert(
         \Magento\Mtf\Fixture\FixtureInterface $product,
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/Image.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/Image.php
index 60ad65971ffc75730adf007e4c99b72b549cefd6..0136c3431fe3c3d7e701f07fddcfbbfc7e31f9a1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/Image.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/Image.php
@@ -19,6 +19,7 @@ class Image extends DataSource
      * @param FixtureFactory $fixtureFactory
      * @param array $params
      * @param array $data
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(FixtureFactory $fixtureFactory, array $params, $data = [])
     {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
index f414f2d9b8c2f785c184ce4b2b9af742a922af4f..5e0a61a9c0426be36736e9361ed8970ca4f2243d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
@@ -501,7 +501,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCart" />
         </variation>
         <variation name="CreateSimpleProductEntityWithImageTestVariation1">
-            <data name="description" xsi:type="string">Create product with image</data>
+            <data name="description" xsi:type="string">Create product with image and try to save it again</data>
             <data name="product/data/image/0/file" xsi:type="string">Magento/Catalog/Test/_files/test1.png</data>
             <data name="product/data/image/1/file" xsi:type="string">Magento/Catalog/Test/_files/test2.png</data>
             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
@@ -509,6 +509,7 @@
             <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">10</data>
             <data name="product/data/weight" xsi:type="string">50</data>
+            <data name="tag" xsi:type="string">severity:S1</data>
             <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">100</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCanUpdate" />