diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Messages.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Messages.php
index d5133e594c59cfa14e45ca5e2c1fafbf0bf1b3fa..1a3bbfefab7bae3eb38d7734347d13100a645fa5 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Messages.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Messages.php
@@ -7,7 +7,7 @@
 namespace Magento\Cms\Test\Block;
 
 /**
- * Messages block.
+ * Store front messages block.
  */
 class Messages extends \Magento\Ui\Test\Block\Messages
 {
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml
index 571d0f2f66054c930f6953ddca6a8a208cbec9c7..b747464c579dea402a631212419a0e01ff03598b 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml
@@ -17,6 +17,6 @@
         <block name="currencyBlock" class="Magento\Directory\Test\Block\Currency\Switcher" locator=".switcher.currency" strategy="css selector" />
         <block name="cmsPageBlock" class="Magento\Cms\Test\Block\Page" locator=".page-main" strategy="css selector" />
         <block name="widgetView" class="Magento\Widget\Test\Block\WidgetView" locator=".widget" strategy="css selector" />
-        <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".messages" strategy="css selector"/>
+        <block name="messagesBlock" class="Magento\Cms\Test\Block\Messages" locator=".messages" strategy="css selector"/>
     </page>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Messages.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Messages.php
index 66ac6b7058ddd103e2aec49ca81311c5cf7ef84b..c29e56d421bc340690989bae377148453e662619 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Messages.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Messages.php
@@ -42,6 +42,13 @@ class Messages extends Block
      */
     protected $noticeMessage = '[data-ui-id$=message-notice]';
 
+    /**
+     * Warning message selector.
+     *
+     * @var string
+     */
+    protected $warningMessage = '[data-ui-id$=message-warning]';
+
     /**
      * Wait for success message.
      *
@@ -140,4 +147,15 @@ class Messages extends Block
         $this->waitForElementVisible($this->noticeMessage);
         return $this->_rootElement->find($this->noticeMessage)->getText();
     }
+
+    /**
+     * Get warning message which is present on the page.
+     *
+     * @return string
+     */
+    public function getWarningMessage()
+    {
+        $this->waitForElementVisible($this->warningMessage);
+        return $this->_rootElement->find($this->warningMessage)->getText();
+    }
 }