diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
index 3a0406ba9344ecb1ce22293f092acdb7e00eb507..81b98fd342f9e53edd345487c188171f6ace22e2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php
@@ -28,7 +28,7 @@ class CustomerForm extends FormTabs
      *
      * @var string
      */
-    protected $activeFormTab = '.entry-edit.form-inline [data-bind="visible: active"]:not([style="display: none;"])';
+    protected $activeFormTab = '#container [data-bind="visible: active"]:not([style="display: none;"])';
 
     /**
      * Field wrapper with label on form.
diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutSuccess.xml b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutSuccess.xml
index 1d15c7fc371be8478588de771f17bdf185aceda5..aa8346258cd9ce585d840fc2aecfcebc584bc40e 100644
--- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutSuccess.xml
+++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/Page/MultishippingCheckoutSuccess.xml
@@ -8,6 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="MultishippingCheckoutSuccess" mca="multishipping/checkout/success" module="Magento_Multishipping">
         <block name="successBlock" class="Magento\Multishipping\Test\Block\Checkout\Success" locator=".multicheckout.success" strategy="css selector"/>
-        <block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".title" strategy="css selector"/>
+        <block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".page-title" strategy="css selector"/>
     </page>
 </config>
\ No newline at end of file