diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontNavigateCategoryNextPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontNavigateCategoryNextPageActionGroup.xml
new file mode 100644
index 0000000000000..5fe97debb1593
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontNavigateCategoryNextPageActionGroup.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Navigates storefront category next page from toolbar -->
+    <actionGroup name="StorefrontNavigateCategoryNextPageActionGroup">
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
+        <waitForPageLoad stepKey="waitForNextCategoryPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php b/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php
index 4fb60ceeef6bb..9ba1083adab74 100644
--- a/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php
+++ b/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php
@@ -95,7 +95,10 @@ public function __construct(
     }
 
     /**
+     * Set filter and attribute objects
+     *
      * @param \Magento\Catalog\Model\Layer\Filter\AbstractFilter $filter
+     *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -108,6 +111,8 @@ public function setSwatchFilter(\Magento\Catalog\Model\Layer\Filter\AbstractFilt
     }
 
     /**
+     * Get attribute swatch data
+     *
      * @return array
      */
     public function getSwatchData()
@@ -138,8 +143,11 @@ public function getSwatchData()
     }
 
     /**
+     * Build filter option url
+     *
      * @param string $attributeCode
      * @param int $optionId
+     *
      * @return string
      */
     public function buildUrl($attributeCode, $optionId)
@@ -161,7 +169,10 @@ public function buildUrl($attributeCode, $optionId)
     }
 
     /**
+     * Get view data for option with no results
+     *
      * @param Option $swatchOption
+     *
      * @return array
      */
     protected function getUnusedOption(Option $swatchOption)
@@ -174,8 +185,11 @@ protected function getUnusedOption(Option $swatchOption)
     }
 
     /**
+     * Get option data if visible
+     *
      * @param FilterItem[] $filterItems
      * @param Option $swatchOption
+     *
      * @return array
      */
     protected function getFilterOption(array $filterItems, Option $swatchOption)
@@ -190,8 +204,11 @@ protected function getFilterOption(array $filterItems, Option $swatchOption)
     }
 
     /**
+     * Get view data for option
+     *
      * @param FilterItem $filterItem
      * @param Option $swatchOption
+     *
      * @return array
      */
     protected function getOptionViewData(FilterItem $filterItem, Option $swatchOption)
@@ -211,7 +228,10 @@ protected function getOptionViewData(FilterItem $filterItem, Option $swatchOptio
     }
 
     /**
+     * Check if option should be visible
+     *
      * @param FilterItem $filterItem
+     *
      * @return bool
      */
     protected function isOptionVisible(FilterItem $filterItem)
@@ -220,6 +240,8 @@ protected function isOptionVisible(FilterItem $filterItem)
     }
 
     /**
+     * Check if attribute values should be visible with no results
+     *
      * @return bool
      */
     protected function isShowEmptyResults()
@@ -228,7 +250,10 @@ protected function isShowEmptyResults()
     }
 
     /**
+     * Check if option should be disabled
+     *
      * @param FilterItem $filterItem
+     *
      * @return bool
      */
     protected function isOptionDisabled(FilterItem $filterItem)
@@ -237,8 +262,11 @@ protected function isOptionDisabled(FilterItem $filterItem)
     }
 
     /**
+     * Retrieve filter item by id
+     *
      * @param FilterItem[] $filterItems
      * @param integer $id
+     *
      * @return bool|FilterItem
      */
     protected function getFilterItemById(array $filterItems, $id)
@@ -252,8 +280,11 @@ protected function getFilterItemById(array $filterItems, $id)
     }
 
     /**
+     * Get swatch image path
+     *
      * @param string $type
      * @param string $filename
+     *
      * @return string
      */
     public function getSwatchPath($type, $filename)
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontRedirectToFirstPageOnFilteringBySwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontRedirectToFirstPageOnFilteringBySwatchTest.xml
index 27382dab0eacc..49eccc18b1347 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontRedirectToFirstPageOnFilteringBySwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontRedirectToFirstPageOnFilteringBySwatchTest.xml
@@ -32,12 +32,12 @@
 
             <magentoCLI command="config:set catalog/frontend/grid_per_page 1" stepKey="setOneProductPerPage"/>
             <magentoCLI command="config:set catalog/frontend/grid_per_page_values 1" stepKey="setGridPerPage"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
 
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AddTextSwatchToProductActionGroup" stepKey="addSwatchAttribute">
                 <argument name="usedInLayeredNavigation" value="1"/>
             </actionGroup>
+            <magentoCLI command="cache:clean block_html collections config full_page" stepKey="cleanInvalidatedCaches"/>
         </before>
 
         <after>
@@ -48,7 +48,7 @@
 
             <magentoCLI command="config:set catalog/frontend/grid_per_page 12" stepKey="setDefaultProductsPerPage"/>
             <magentoCLI command="config:set catalog/frontend/grid_per_page_values 12,24,36" stepKey="setDefaultGridPerPage"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <magentoCLI command="cache:clean block_html collections config full_page" stepKey="cleanInvalidatedCaches"/>
 
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
@@ -63,7 +63,8 @@
         </actionGroup>
         <actionGroup ref="SaveAttributeSetActionGroup" stepKey="SaveAttributeSet"/>
 
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductsGridPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndexPage"/>
+        <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearFiltersOnProductIndexPage"/>
 
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="goToProduct1EditPage">
             <argument name="product" value="$$createSimpleProduct1$$"/>
@@ -85,18 +86,16 @@
         <selectOption selector="{{AdminProductAttributesSection.attributeDropdownByCode(textSwatchAttribute.attribute_code)}}" userInput="textSwatchOption2" stepKey="selectProduct3AttributeOption"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct3"/>
 
-        <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+        <magentoCron groups="index" stepKey="runCronIndexer"/>
 
-        <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
-
-        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
-        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
-        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage">
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontNavigateCategoryNextPageActionGroup" stepKey="navigateToCategoryNextPage"/>
 
         <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle(textSwatchAttribute.default_label)}}" stepKey="expandAttribute"/>
         <click selector="{{StorefrontCategorySidebarSection.attributeNthOption(textSwatchAttribute.attribute_code, '1')}}" stepKey="filterBySwatch1"/>
-        <waitForPageLoad stepKey="waitForPageToLoad3"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
 
         <actionGroup ref="AssertStorefrontCategoryCurrentPageIsFirstActionGroup" stepKey="assertCurrentPageIsFirst"/>
     </test>