diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
index 019dcf03ef3fc563a2e8647ba7ffde3323fae5ae..1044bb8d4e792de1ef7233ecbe7743283d00d4c9 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
@@ -29,8 +29,7 @@ class QuoteAdapterTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->quoteMock = $this->getMockBuilder('Magento\Quote\Api\Data\CartInterface')
-            ->getMockForAbstractClass();
+        $this->quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
 
         $this->addressAdapterFactoryMock =
             $this->getMockBuilder('Magento\Payment\Gateway\Data\Quote\AddressAdapterFactory')
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index f1de8c0e04c8f7fc18fe65962bedcb74dc05bd1e..43db6a4f4a408f454be306ef1c75e7fe6651aec8 100755
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -4103,6 +4103,9 @@ return [
     ['Magento\Payment\Model\Observer', 'Magento\Payment\Observer\*'],
     ['Magento\Tax\Observer\AggregateSalesReportTaxData', 'Magento\Tax\Model\AggregateSalesReportTaxData'],
     ['Magento\Developer\Console\Command\CssDeployCommand'],
-    ['Magento\Quote\Api\GuestShippingAddressManagementInterface', 'Magento\Quote\Model\GuestCart\GuestShippingAddressManagementInterface'],
+    [
+        'Magento\Quote\Api\GuestShippingAddressManagementInterface',
+        'Magento\Quote\Model\GuestCart\GuestShippingAddressManagementInterface'
+    ],
     ['Magento\Quote\Api\ShippingAddressManagementInterface', 'Magento\Quote\Model\ShippingAddressManagementInterface']
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 5dcdb7b79b7cb2df5d9e74a748db97d4e989fd93..1758d1dad6bc1390b8fb8e8bc5fe3c01d7d66ff1 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -2490,7 +2490,6 @@ return [
     ['getShippingAddress', 'Magento\Quote\Api\Data\CartInterface'],
     ['setShippingAddress', 'Magento\Quote\Api\Data\CartInterface'],
     ['getPaymentById', 'Magento\Quote\Model\Quote'],
-    ['getPaymentById', 'Magento\Quote\Model\Quote'],
     ['create', 'Magento\Quote\Model\QuoteRepository'],
     ['set', 'Magento\Quote\Api\GuestShippingMethodManagementInterface', 'Magento\Quote\Model\GuestCart\GuestShippingMethodManagementInterface::set'],
     ['get', 'Magento\Quote\Api\GuestShippingMethodManagementInterface', 'Magento\Quote\Model\GuestCart\GuestShippingMethodManagementInterface::get'],